tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
John Firebaugh
2015-04-20 13:59:04 -07:00
parent d67f862400
commit 7bd735220d
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platform/ios/MGLMapView.mm
View File

@@ -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;

2
test/api/repeated_render.cpp
View File

@@ -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);

2
test/api/set_style.cpp
View File

@@ -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");

2
test/headless/headless.cpp
View File

@@ -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");