diff options
| author | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-09-12 15:46:05 -0700 |
|---|---|---|
| committer | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-09-20 09:05:45 -0700 |
| commit | 2d84e2a1aea2581bc674620090ca8dbd971ee7af (patch) | |
| tree | c6bbc3de0c3f109a1be4805a209c6d525c244713 | |
| parent | 2fcbd78062552a7fd4471bc0896b79f9888b91e8 (diff) | |
| download | qtlocation-mapboxgl-2d84e2a1aea2581bc674620090ca8dbd971ee7af.tar.gz | |
Fix platform dependent number type `unsigned long` -> `uint64_t`
| -rw-r--r-- | include/mbgl/storage/offline.hpp | 2 | ||||
| -rw-r--r-- | platform/default/mbgl/storage/offline.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/util/tile_cover.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/util/tile_cover.hpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/mbgl/storage/offline.hpp b/include/mbgl/storage/offline.hpp index afb2fa1e81..117dd0591b 100644 --- a/include/mbgl/storage/offline.hpp +++ b/include/mbgl/storage/offline.hpp @@ -31,7 +31,7 @@ public: /* Private */ std::vector<CanonicalTileID> tileCover(SourceType, uint16_t tileSize, const Range<uint8_t>& zoomRange) const; - unsigned long tileCount(SourceType, uint16_t tileSize, const Range<uint8_t>& zoomRange) const; + uint64_t tileCount(SourceType, uint16_t tileSize, const Range<uint8_t>& zoomRange) const; const std::string styleURL; const LatLngBounds bounds; const double minZoom; diff --git a/platform/default/mbgl/storage/offline.cpp b/platform/default/mbgl/storage/offline.cpp index 644684c8a6..9ec789f725 100644 --- a/platform/default/mbgl/storage/offline.cpp +++ b/platform/default/mbgl/storage/offline.cpp @@ -38,7 +38,7 @@ std::vector<CanonicalTileID> OfflineTilePyramidRegionDefinition::tileCover(Sourc return result; } -unsigned long OfflineTilePyramidRegionDefinition::tileCount(SourceType type, uint16_t tileSize, const Range<uint8_t>& zoomRange) const { +uint64_t OfflineTilePyramidRegionDefinition::tileCount(SourceType type, uint16_t tileSize, const Range<uint8_t>& zoomRange) const { const Range<uint8_t> clampedZoomRange = coveringZoomRange(type, tileSize, zoomRange); unsigned long result = 0;; diff --git a/src/mbgl/util/tile_cover.cpp b/src/mbgl/util/tile_cover.cpp index c06634c9b2..a5a1b1d70c 100644 --- a/src/mbgl/util/tile_cover.cpp +++ b/src/mbgl/util/tile_cover.cpp @@ -170,9 +170,9 @@ std::vector<UnwrappedTileID> tileCover(const TransformState& state, int32_t z) { } // Taken from https://github.com/mapbox/sphericalmercator#xyzbbox-zoom-tms_style-srs -// Computes the projected tiles for the lower left and uppoer right points of the bounds +// Computes the projected tiles for the lower left and upper right points of the bounds // and uses that to compute the tile cover count -unsigned long tileCount(const LatLngBounds& bounds, uint8_t zoom, uint16_t tileSize_){ +uint64_t tileCount(const LatLngBounds& bounds, uint8_t zoom, uint16_t tileSize_){ auto sw = Projection::project(bounds.southwest().wrapped(), zoom, tileSize_); auto ne = Projection::project(bounds.northeast().wrapped(), zoom, tileSize_); diff --git a/src/mbgl/util/tile_cover.hpp b/src/mbgl/util/tile_cover.hpp index 405e6a48e6..3c7a4ee44a 100644 --- a/src/mbgl/util/tile_cover.hpp +++ b/src/mbgl/util/tile_cover.hpp @@ -19,7 +19,7 @@ std::vector<UnwrappedTileID> tileCover(const TransformState&, int32_t z); std::vector<UnwrappedTileID> tileCover(const LatLngBounds&, int32_t z); // Compute only the count of tiles needed for tileCover -unsigned long tileCount(const LatLngBounds&, uint8_t z, uint16_t tileSize); +uint64_t tileCount(const LatLngBounds&, uint8_t z, uint16_t tileSize); } // namespace util } // namespace mbgl |