summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2018-05-22 20:49:28 +0200
committerTobrun <tobrun.van.nuland@gmail.com>2018-05-22 20:49:28 +0200
commitf40e6615534b0da709ef0ab2828b02d3987888bd (patch)
treea750ef00b02c30eb46ae925c9ebc7c2a6e6a7473
parent978c7b52b34f9ff6fbbf0339e1f8c65a76eaa04e (diff)
downloadqtlocation-mapboxgl-upstream/tvn-style-json-snapshotter.tar.gz
[darwin] - replace styleUrl withe std::pair<bool, std::string>upstream/tvn-style-json-snapshotter
-rw-r--r--platform/darwin/src/MGLMapSnapshotter.mm3
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/darwin/src/MGLMapSnapshotter.mm b/platform/darwin/src/MGLMapSnapshotter.mm
index 923c8fb2a1..76d99a0411 100644
--- a/platform/darwin/src/MGLMapSnapshotter.mm
+++ b/platform/darwin/src/MGLMapSnapshotter.mm
@@ -428,6 +428,7 @@ const CGFloat MGLSnapshotterMinimumPixelSize = 64;
_mbglThreadPool = mbgl::sharedThreadPool();
std::string styleURL = std::string([options.styleURL.absoluteString UTF8String]);
+ std::pair<bool, std::string> style = std::make_pair(false, styleURL);
// Size; taking into account the minimum texture size for OpenGL ES
// For non retina screens the ratio is 1:1 MGLSnapshotterMinimumPixelSize
@@ -454,7 +455,7 @@ const CGFloat MGLSnapshotterMinimumPixelSize = 64;
}
// Create the snapshotter
- _mbglMapSnapshotter = std::make_unique<mbgl::MapSnapshotter>(*mbglFileSource, *_mbglThreadPool, styleURL, size, pixelRatio, cameraOptions, coordinateBounds);
+ _mbglMapSnapshotter = std::make_unique<mbgl::MapSnapshotter>(*mbglFileSource, *_mbglThreadPool, style, size, pixelRatio, cameraOptions, coordinateBounds);
}
@end