diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-10-29 18:13:12 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-10-31 16:53:07 +0200 |
| commit | 38f536049a8ed8f4bdf7706f4afcbbaf06c974c9 (patch) | |
| tree | f65bb6ad0ebde1840e523b18d539f122548194ab /src/mbgl/map/transform_state.cpp | |
| parent | a70bfd89108cf1aef75181819ae43e550a69255e (diff) | |
| download | qtlocation-mapboxgl-38f536049a8ed8f4bdf7706f4afcbbaf06c974c9.tar.gz | |
[core] Moved util::log2 to its own header
- Added util::{MIN,MAX}_ZOOM_F to avoid consecutive conversions from
double to float
- Move util::log2 to its own header (part of mbgl/math)
Diffstat (limited to 'src/mbgl/map/transform_state.cpp')
| -rw-r--r-- | src/mbgl/map/transform_state.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/map/transform_state.cpp b/src/mbgl/map/transform_state.cpp index 188b3aa79a..5a8d495bac 100644 --- a/src/mbgl/map/transform_state.cpp +++ b/src/mbgl/map/transform_state.cpp @@ -2,7 +2,7 @@ #include <mbgl/tile/tile_id.hpp> #include <mbgl/util/constants.hpp> #include <mbgl/util/interpolate.hpp> -#include <mbgl/util/math.hpp> +#include <mbgl/math/log2.hpp> #include <mbgl/math/clamp.hpp> namespace mbgl { @@ -117,7 +117,7 @@ double TransformState::pixel_y() const { #pragma mark - Zoom double TransformState::getZoom() const { - return std::log(scale) / M_LN2; + return scaleZoom(scale); } int32_t TransformState::getIntegerZoom() const { |