diff options
author | Leith Bade <leith@mapbox.com> | 2014-12-03 23:03:14 +1100 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2014-12-03 23:03:14 +1100 |
commit | 6be8c840bbe1bb14f2ab32fefdd2a600f1363a08 (patch) | |
tree | b4275a22c5e0336cb19ad2f455056eda31fcfbfd | |
parent | 08ce7157f1e355b9f0e827b2d47836f55a4f112b (diff) | |
download | qtlocation-mapboxgl-6be8c840bbe1bb14f2ab32fefdd2a600f1363a08.tar.gz |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | platform/default/glfw_view.cpp | 6 |
2 files changed, 1 insertions, 7 deletions
@@ -37,7 +37,7 @@ case ${MASON_PLATFORM} in LIBZIP_VERSION=0.11.2 ;; *) - GLFW_VERSION=a21f2377 + GLFW_VERSION=e1ae9af5 SQLITE_VERSION=system LIBPNG_VERSION=1.6.13 LIBJPEG_VERSION=v8d diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp index d835d03ecf..e600340dda 100644 --- a/platform/default/glfw_view.cpp +++ b/platform/default/glfw_view.cpp @@ -263,12 +263,6 @@ void GLFWView::notify() { void GLFWView::swap() { glfwPostEmptyEvent(); - - double lon, lat, zoom; - map->getLonLatZoom(lon, lat, zoom); - const double bearing = map->getBearing(); - const std::string title = mbgl::util::sprintf<128>("Mapbox GL – %.2f/%.6f/%.6f/%.1f", zoom, lat, lon, bearing); - glfwSetWindowTitle(window, title.c_str()); } void GLFWView::notify_map_change(mbgl::MapChange /*change*/, mbgl::timestamp /*delay*/) { |