diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-24 13:56:05 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-28 13:59:14 -0800 |
| commit | e18f60229e8a8a00d6aaa617ac635a0f084465ba (patch) | |
| tree | 041d25a270d06d354a36a162c74b407be3ebdcee /src/mbgl/text/quads.cpp | |
| parent | 02d56488e40f1ae5d3408b3e9fe62166a27f4599 (diff) | |
| download | qtlocation-mapboxgl-e18f60229e8a8a00d6aaa617ac635a0f084465ba.tar.gz | |
[core] There's only ever one icon quad
Diffstat (limited to 'src/mbgl/text/quads.cpp')
| -rw-r--r-- | src/mbgl/text/quads.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mbgl/text/quads.cpp b/src/mbgl/text/quads.cpp index b4a3ea09a4..6113d1f5d4 100644 --- a/src/mbgl/text/quads.cpp +++ b/src/mbgl/text/quads.cpp @@ -13,7 +13,7 @@ using namespace style; const float globalMinScale = 0.5f; // underscale by 1 zoom level -SymbolQuads getIconQuads(Anchor& anchor, const PositionedIcon& shapedIcon, +SymbolQuad getIconQuad(Anchor& anchor, const PositionedIcon& shapedIcon, const GeometryCoordinates& line, const SymbolLayoutProperties::Evaluated& layout, const style::SymbolPlacementType placement, const Shaping& shapedText) { @@ -88,9 +88,7 @@ SymbolQuads getIconQuads(Anchor& anchor, const PositionedIcon& shapedIcon, br = util::matrixMultiply(matrix, br); } - SymbolQuads quads; - quads.emplace_back(tl, tr, bl, br, image.pos, 0, 0, anchor.point, globalMinScale, std::numeric_limits<float>::infinity(), shapedText.writingMode); - return quads; + return SymbolQuad { tl, tr, bl, br, image.pos, 0, 0, anchor.point, globalMinScale, std::numeric_limits<float>::infinity(), shapedText.writingMode }; } struct GlyphInstance { |