diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-09-13 17:37:30 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-09-19 14:51:32 +0300 |
commit | f997ae00ae960f38d6920a625fcb7237e5909f9c (patch) | |
tree | 4478f9e94c4181f68a1d76128e9514800f586d31 /src/mbgl/renderer/buckets/symbol_bucket.hpp | |
parent | 80e8d7a2fcb9f75e585bb7dd26c2f2a893b6f560 (diff) | |
download | qtlocation-mapboxgl-f997ae00ae960f38d6920a625fcb7237e5909f9c.tar.gz |
[core] Fix Placement constness
Update buckets methods do not mutate placement, placement methods do not mutate buckets.
Diffstat (limited to 'src/mbgl/renderer/buckets/symbol_bucket.hpp')
-rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp index 020190b81f..c2bbcd40a0 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.hpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp @@ -68,7 +68,7 @@ public: bool hasData() const override; std::pair<uint32_t, bool> registerAtCrossTileIndex(CrossTileSymbolLayerIndex&, const OverscaledTileID&, uint32_t& maxCrossTileID) override; void place(Placement&, const BucketPlacementParameters&, std::set<uint32_t>&) override; - void updateVertices(Placement&, bool updateOpacities, const TransformState&, const RenderTile&, std::set<uint32_t>&) override; + void updateVertices(const Placement&, bool updateOpacities, const TransformState&, const RenderTile&, std::set<uint32_t>&) override; bool hasTextData() const; bool hasIconData() const; bool hasSdfIconData() const; @@ -176,7 +176,7 @@ public: const std::vector<style::TextWritingModeType> placementModes; mutable optional<bool> hasFormatSectionOverrides_; - std::shared_ptr<std::vector<size_t>> featureSortOrder; + FeatureSortOrder featureSortOrder; }; } // namespace mbgl |