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-12 17:46:10 -0700 |
| commit | 7f7cef850310429643bfac301c05955718272346 (patch) | |
| tree | 707a323d733f938c538f517ffbdf8ab47407bd78 | |
| parent | 366a69785a2fffd0713897f53647cf18b7a0c645 (diff) | |
| download | qtlocation-mapboxgl-upstream/fix-unsignedlong.tar.gz | |
Fix platform dependent number type `unsigned long` -> `uint64_t`upstream/fix-unsignedlong
| -rw-r--r-- | include/mbgl/storage/offline.hpp | 2 | ||||
| -rw-r--r-- | platform/default/mbgl/storage/offline.cpp | 2 | ||||
| -rw-r--r-- | platform/ios/ios.xcodeproj/project.pbxproj | 5 | ||||
| -rw-r--r-- | src/mbgl/util/tile_cover.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/util/tile_cover.hpp | 2 |
5 files changed, 8 insertions, 7 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/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index 060fb45d81..60ed63cde5 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -2020,6 +2020,7 @@ TargetAttributes = { DA1DC9491CB6C1C2006E619F = { CreatedOnToolsVersion = 7.3; + DevelopmentTeam = GJZR2MEM28; LastSwiftMigration = 0820; }; DA25D5B81CCD9EDE00607828 = { @@ -2692,7 +2693,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = GJZR2MEM28; INFOPLIST_FILE = "$(SRCROOT)/app/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -2706,7 +2707,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = GJZR2MEM28; INFOPLIST_FILE = "$(SRCROOT)/app/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; 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 |