summaryrefslogtreecommitdiff
path: root/src/mbgl/util/grid_index.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/util/grid_index.hpp')
-rw-r--r--src/mbgl/util/grid_index.hpp10
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;