summaryrefslogtreecommitdiff
path: root/src/renderer/painter_fill.cpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-05-30 17:00:47 +0200
committerKonstantin Käfer <mail@kkaefer.com>2014-05-30 17:00:47 +0200
commit78fda8bb62a85fe0a536d2f38832a6123739e4c1 (patch)
treebb89f96a11341554101557b41a9ebad75d99a368 /src/renderer/painter_fill.cpp
parent3e7f801de11ef6a73578f58cbd89b61a6448924b (diff)
downloadqtlocation-mapboxgl-78fda8bb62a85fe0a536d2f38832a6123739e4c1.tar.gz
make sure we retain shared state when destructing the map object
refs #261
Diffstat (limited to 'src/renderer/painter_fill.cpp')
-rw-r--r--src/renderer/painter_fill.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/renderer/painter_fill.cpp b/src/renderer/painter_fill.cpp
index d0ba2a8de3..0cc137013f 100644
--- a/src/renderer/painter_fill.cpp
+++ b/src/renderer/painter_fill.cpp
@@ -65,9 +65,9 @@ void Painter::renderFill(FillBucket& bucket, const FillProperties& properties, c
}
if ((fill_color[3] >= 1.0f) == (pass == Opaque)) {
- auto &sprite = map.getStyle().sprite;
+ const std::shared_ptr<Sprite> &sprite = map.getStyle()->sprite;
if (properties.image.size() && sprite) {
- auto &spriteAtlas = map.getSpriteAtlas();
+ SpriteAtlas &spriteAtlas = *map.getSpriteAtlas();
Rect<uint16_t> imagePos = spriteAtlas.getImage(properties.image, *sprite);
@@ -144,7 +144,7 @@ void Painter::renderFill(FillBucket& bucket, const std::string& layer_name, cons
// Abort early.
if (!bucket.hasData()) return;
- const std::unordered_map<std::string, FillProperties> &fill_properties = map.getStyle().computed.fills;
+ const std::unordered_map<std::string, FillProperties> &fill_properties = map.getStyle()->computed.fills;
const std::unordered_map<std::string, FillProperties>::const_iterator fill_properties_it = fill_properties.find(layer_name);
const FillProperties &properties = fill_properties_it != fill_properties.end()