diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-04-20 13:59:04 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-04-28 14:32:21 -0400 |
| commit | 7bd735220de0ee09e2bbe4f49185f8341e4b88b1 (patch) | |
| tree | 94b16718ee246a11f59793bfdd7dd589751cce67 | |
| parent | d67f862400c5b04b6ba23e38fdb24cdf3471f6c3 (diff) | |
| download | qtlocation-mapboxgl-7bd735220de0ee09e2bbe4f49185f8341e4b88b1.tar.gz | |
Fix build
| -rw-r--r-- | platform/ios/MGLMapView.mm | 5 | ||||
| -rw-r--r-- | test/api/repeated_render.cpp | 2 | ||||
| -rw-r--r-- | test/api/set_style.cpp | 2 | ||||
| -rw-r--r-- | test/headless/headless.cpp | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm index cac54355a7..a0e2ccb244 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/MGLMapView.mm @@ -14,6 +14,7 @@ #include <mbgl/storage/sqlite_cache.hpp> #include <mbgl/storage/network_status.hpp> #include <mbgl/util/geo.hpp> +#include <mbgl/util/constants.hpp> #import "MGLTypes.h" #import "NSString+MGLAdditions.h" @@ -627,8 +628,8 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr; CGFloat zoomFactor = mbglMap->getMaxZoom() - mbglMap->getMinZoom() + 1; CGFloat cpuFactor = (CGFloat)[[NSProcessInfo processInfo] processorCount]; CGFloat memoryFactor = (CGFloat)[[NSProcessInfo processInfo] physicalMemory] / 1000 / 1000 / 1000; - CGFloat sizeFactor = ((CGFloat)mbglMap->getState().getWidth() / mbgl::util::tileSize) * - ((CGFloat)mbglMap->getState().getHeight() / mbgl::util::tileSize); + CGFloat sizeFactor = ((CGFloat)mbglMap->getWidth() / mbgl::util::tileSize) * + ((CGFloat)mbglMap->getHeight() / mbgl::util::tileSize); NSUInteger cacheSize = zoomFactor * cpuFactor * memoryFactor * sizeFactor * 0.5; diff --git a/test/api/repeated_render.cpp b/test/api/repeated_render.cpp index 25a5d5d28f..6dbc001eae 100644 --- a/test/api/repeated_render.cpp +++ b/test/api/repeated_render.cpp @@ -24,7 +24,7 @@ TEST(API, RepeatedRender) { Map map(view, fileSource); - map.start(Map::Mode::Still); + map.start(MapMode::Still); { view.resize(128, 512, 1); diff --git a/test/api/set_style.cpp b/test/api/set_style.cpp index 11921a43ce..c918e665e6 100644 --- a/test/api/set_style.cpp +++ b/test/api/set_style.cpp @@ -18,7 +18,7 @@ TEST(API, SetStyle) { Map map(view, fileSource); - map.start(Map::Mode::Still); + map.start(MapMode::Still); map.setStyleJSON("invalid", "test/suite"); diff --git a/test/headless/headless.cpp b/test/headless/headless.cpp index aac5dda833..7e22f76211 100644 --- a/test/headless/headless.cpp +++ b/test/headless/headless.cpp @@ -145,7 +145,7 @@ TEST_P(HeadlessTest, render) { DefaultFileSource fileSource(nullptr); Map map(view, fileSource); - map.start(Map::Mode::Still); + map.start(MapMode::Still); map.setClasses(classes); map.setStyleJSON(style, "test/suite"); |