diff options
author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-07-29 17:48:22 +0300 |
---|---|---|
committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-07-30 14:46:18 +0300 |
commit | 3b3e4a4772e98bac7ee43a5a02adc7596dff557a (patch) | |
tree | b752a105a86ba8e027993ddb58b6e1efdfee1543 /src/mbgl/util/grid_index.hpp | |
parent | e338e1d515074b8b370bb38c25b16ff68d16cef1 (diff) | |
download | qtlocation-mapboxgl-3b3e4a4772e98bac7ee43a5a02adc7596dff557a.tar.gz |
[core] Fix int overflow issue in GridIndex
Diffstat (limited to 'src/mbgl/util/grid_index.hpp')
-rw-r--r-- | src/mbgl/util/grid_index.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/util/grid_index.hpp b/src/mbgl/util/grid_index.hpp index 4c2d7dccc8..cb38023e59 100644 --- a/src/mbgl/util/grid_index.hpp +++ b/src/mbgl/util/grid_index.hpp @@ -57,7 +57,7 @@ template <class T> class GridIndex { public: - GridIndex(const float width_, const float height_, const int16_t cellSize_); + GridIndex(const float width_, const float height_, const uint32_t cellSize_); using BBox = mapbox::geometry::box<float>; using BCircle = geometry::circle<float>; @@ -81,8 +81,8 @@ private: void query(const BBox&, std::function<bool (const T&, const BBox&)>) const; void query(const BCircle&, std::function<bool (const T&, const BBox&)>) const; - int16_t convertToXCellCoord(const float x) const; - int16_t convertToYCellCoord(const float y) const; + std::size_t convertToXCellCoord(const float x) const; + std::size_t convertToYCellCoord(const float y) const; bool boxesCollide(const BBox&, const BBox&) const; bool circlesCollide(const BCircle&, const BCircle&) const; @@ -91,8 +91,8 @@ private: const float width; const float height; - const int16_t xCellCount; - const int16_t yCellCount; + const std::size_t xCellCount; + const std::size_t yCellCount; const double xScale; const double yScale; |