diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-30 16:01:59 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-31 13:26:27 -0700 |
| commit | c4f9582bfa9be832eb2eb349249918db8b867ec9 (patch) | |
| tree | 18116f417ab24e420664ff26256c5e0a9db2d095 /src/mbgl/text | |
| parent | d7a55a4be1300d79da0c63aefdf5d48d0c45a404 (diff) | |
| download | qtlocation-mapboxgl-c4f9582bfa9be832eb2eb349249918db8b867ec9.tar.gz | |
[core] Pass fully-evaluated layout properties to SymbolInstance and quad methods
Diffstat (limited to 'src/mbgl/text')
| -rw-r--r-- | src/mbgl/text/quads.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/text/quads.hpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/text/quads.cpp b/src/mbgl/text/quads.cpp index d3edafa1a0..b13a6a71e5 100644 --- a/src/mbgl/text/quads.cpp +++ b/src/mbgl/text/quads.cpp @@ -18,7 +18,7 @@ const float globalMinScale = 0.5f; // underscale by 1 zoom level SymbolQuad getIconQuad(const Anchor& anchor, const PositionedIcon& shapedIcon, const GeometryCoordinates& line, - const SymbolLayoutProperties::PossiblyEvaluated& layout, + const SymbolLayoutProperties::Evaluated& layout, const style::SymbolPlacementType placement, const Shaping& shapedText) { auto image = *(shapedIcon.image); @@ -292,7 +292,7 @@ SymbolQuads getGlyphQuads(Anchor& anchor, const Shaping& shapedText, const float boxScale, const GeometryCoordinates& line, - const SymbolLayoutProperties::PossiblyEvaluated& layout, + const SymbolLayoutProperties::Evaluated& layout, const style::SymbolPlacementType placement, const GlyphPositions& face) { const float textRotate = layout.get<TextRotate>() * util::DEG2RAD; diff --git a/src/mbgl/text/quads.hpp b/src/mbgl/text/quads.hpp index 7e3b5ca405..f1529d8829 100644 --- a/src/mbgl/text/quads.hpp +++ b/src/mbgl/text/quads.hpp @@ -54,7 +54,7 @@ typedef std::vector<SymbolQuad> SymbolQuads; SymbolQuad getIconQuad(const Anchor& anchor, const PositionedIcon& shapedIcon, const GeometryCoordinates& line, - const style::SymbolLayoutProperties::PossiblyEvaluated&, + const style::SymbolLayoutProperties::Evaluated&, style::SymbolPlacementType placement, const Shaping& shapedText); @@ -62,7 +62,7 @@ SymbolQuads getGlyphQuads(Anchor& anchor, const Shaping& shapedText, const float boxScale, const GeometryCoordinates& line, - const style::SymbolLayoutProperties::PossiblyEvaluated&, + const style::SymbolLayoutProperties::Evaluated&, style::SymbolPlacementType placement, const GlyphPositions& face); |