summaryrefslogtreecommitdiff
path: root/src/mbgl/layout/symbol_layout.hpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-12-14 14:58:06 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-12-20 08:30:39 -0800
commitdad57df38ef86363da9bff2e62f3fddc5688f0cf (patch)
tree361bff89dbee074d9c6313142a0df3de2b1dc69b /src/mbgl/layout/symbol_layout.hpp
parent3dcff6c3e11caa454893f44a300a3be0120325a3 (diff)
downloadqtlocation-mapboxgl-dad57df38ef86363da9bff2e62f3fddc5688f0cf.tar.gz
[core] Fix symbol rendering for multipoints
Ports https://github.com/mapbox/mapbox-gl-js/pull/3763 and https://github.com/mapbox/mapbox-gl-js/pull/3806.
Diffstat (limited to 'src/mbgl/layout/symbol_layout.hpp')
-rw-r--r--src/mbgl/layout/symbol_layout.hpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mbgl/layout/symbol_layout.hpp b/src/mbgl/layout/symbol_layout.hpp
index faed2de2a0..18fb9ff4bc 100644
--- a/src/mbgl/layout/symbol_layout.hpp
+++ b/src/mbgl/layout/symbol_layout.hpp
@@ -59,11 +59,10 @@ public:
const std::string sourceLayerName;
private:
- void addFeature(const GeometryCollection&,
+ void addFeature(const SymbolFeature&,
const Shaping& shapedText,
const PositionedIcon& shapedIcon,
- const GlyphPositions& face,
- const size_t index);
+ const GlyphPositions& face);
bool anchorIsTooClose(const std::u16string& text, const float repeatDistance, const Anchor&);
std::map<std::u16string, std::vector<Anchor>> compareText;