fix binding to vaos

2014-08-14 18:24:53 +02:00
parent 1799c1b04c
commit d6bfb4be65
10 changed files with 34 additions and 25 deletions
--- a/src/map/transform.cpp
+++ b/src/map/transform.cpp
@@ -128,9 +128,9 @@ void Transform::getLonLat(double &lon, double &lat) const {
 }

 void Transform::getLonLatZoom(double &lon, double &lat, double &zoom) const {
-    uv::readlock lock(mtx);
-
    getLonLat(lon, lat);
+
+    uv::readlock lock(mtx);
    zoom = getZoom();
 }

@@ -192,7 +192,7 @@ void Transform::setZoom(const double zoom, const timestamp duration) {
 double Transform::getZoom() const {
    uv::readlock lock(mtx);

-    return log(final.scale) / M_LN2;
+    return std::log(final.scale) / M_LN2;
 }

 double Transform::getScale() const {