diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-06-20 15:19:12 -0700 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2017-06-21 17:18:08 -0700 |
| commit | 244484ca6c64b6024a59786a194ea8ba19fae809 (patch) | |
| tree | e7f8ed853543bf885b95145fea2c42d6591589d5 /src/mbgl/renderer | |
| parent | 7b90af5d3580bd57cd4280173c1d2b0ee542b89d (diff) | |
| download | qtlocation-mapboxgl-244484ca6c64b6024a59786a194ea8ba19fae809.tar.gz | |
[core] retain GeometryTileLayer in SymbolLayout
We're storing GeometryTileFeature objects in SymbolLayout, but they may reference data in GeometryTileLayer, which could go away if we don't retain it.
Diffstat (limited to 'src/mbgl/renderer')
| -rw-r--r-- | src/mbgl/renderer/layers/render_symbol_layer.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/renderer/layers/render_symbol_layer.hpp | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index 2edb1ad3c3..9d59162a86 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -23,12 +23,12 @@ std::unique_ptr<Bucket> RenderSymbolLayer::createBucket(const BucketParameters&, std::unique_ptr<SymbolLayout> RenderSymbolLayer::createLayout(const BucketParameters& parameters, const std::vector<const RenderLayer*>& group, - const GeometryTileLayer& layer, + std::unique_ptr<GeometryTileLayer> layer, GlyphDependencies& glyphDependencies, ImageDependencies& imageDependencies) const { return std::make_unique<SymbolLayout>(parameters, group, - layer, + std::move(layer), imageDependencies, glyphDependencies); } diff --git a/src/mbgl/renderer/layers/render_symbol_layer.hpp b/src/mbgl/renderer/layers/render_symbol_layer.hpp index 99fd09111a..2199103de2 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.hpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.hpp @@ -71,8 +71,11 @@ public: style::SymbolPropertyValues textPropertyValues(const style::SymbolLayoutProperties::PossiblyEvaluated&) const; std::unique_ptr<Bucket> createBucket(const BucketParameters&, const std::vector<const RenderLayer*>&) const override; - std::unique_ptr<SymbolLayout> createLayout(const BucketParameters&, const std::vector<const RenderLayer*>&, - const GeometryTileLayer&, GlyphDependencies&, ImageDependencies&) const; + std::unique_ptr<SymbolLayout> createLayout(const BucketParameters&, + const std::vector<const RenderLayer*>&, + std::unique_ptr<GeometryTileLayer>, + GlyphDependencies&, + ImageDependencies&) const; // Paint properties style::SymbolPaintProperties::Unevaluated unevaluated; |