diff options
Diffstat (limited to 'src/mbgl/map/map.cpp')
| -rw-r--r-- | src/mbgl/map/map.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 5b96b83199..f357c05e88 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -202,9 +202,9 @@ void Map::fitBounds(AnnotationSegment segment, EdgeInsets padding, const Duratio // Calculate the zoom level. double scaleX = (getWidth() - padding.left - padding.right) / size.x; double scaleY = (getHeight() - padding.top - padding.bottom) / size.y; - double minScale = std::fmin(scaleX, scaleY); - double zoom = std::log2(getScale() * minScale); - zoom = std::fmax(std::fmin(zoom, getMaxZoom()), getMinZoom()); + double minScale = ::fmin(scaleX, scaleY); + double zoom = ::log2(getScale() * minScale); + zoom = ::fmax(::fmin(zoom, getMaxZoom()), getMinZoom()); // Calculate the center point of a virtual bounds that is extended in all directions by padding. vec2<> paddedNEPixel = { |