[core] fix infinite loop in mbgl::resample

fix #4416
mapbox · Mar 29, 2016 · a22984b · a22984b
1 parent 3cc55a9
commit a22984b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp
@@ -60,7 +60,7 @@ SymbolBucket::SymbolBucket(uint32_t overscaling_, float zoom_, const MapMode mod
     : overscaling(overscaling_),
       zoom(zoom_),
       tileSize(util::tileSize * overscaling_),
-      tilePixelRatio(util::EXTENT / tileSize),
+      tilePixelRatio(float(util::EXTENT) / tileSize),
       mode(mode_) {}
 
 SymbolBucket::~SymbolBucket() {

diff --git a/src/mbgl/text/get_anchors.cpp b/src/mbgl/text/get_anchors.cpp
@@ -3,6 +3,7 @@
 #include <mbgl/util/constants.hpp>
 #include <mbgl/util/interpolate.hpp>
 
+#include <cassert>
 #include <cmath>
 
 namespace mbgl {
@@ -21,6 +22,8 @@ Anchors resample(const GeometryCoordinates &line, const float offset, const floa
 
     Anchors anchors;
 
+    assert(spacing > 0.0);
+
     int i = 0;
     for (auto it = line.begin(), end = line.end() - 1; it != end; it++, i++) {
         const GeometryCoordinate &a = *(it);