From 78fda8bb62a85fe0a536d2f38832a6123739e4c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Fri, 30 May 2014 17:00:47 +0200 Subject: make sure we retain shared state when destructing the map object refs #261 --- src/renderer/painter_fill.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/renderer/painter_fill.cpp') 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 = map.getStyle()->sprite; if (properties.image.size() && sprite) { - auto &spriteAtlas = map.getSpriteAtlas(); + SpriteAtlas &spriteAtlas = *map.getSpriteAtlas(); Rect 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 &fill_properties = map.getStyle().computed.fills; + const std::unordered_map &fill_properties = map.getStyle()->computed.fills; const std::unordered_map::const_iterator fill_properties_it = fill_properties.find(layer_name); const FillProperties &properties = fill_properties_it != fill_properties.end() -- cgit v1.2.1