diff options
| author | Young Hahn <young@mapbox.com> | 2016-06-15 17:13:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-15 17:13:31 -0400 |
| commit | 199ea2a82a74cf2f7b63078e2dd4b8274c061851 (patch) | |
| tree | 5d56478a020a911745d793b8ac5d7f236730c621 /src/mbgl/text/quads.hpp | |
| parent | a020e535cac36d69a8939fb7956260d2217c65b4 (diff) | |
| download | qtlocation-mapboxgl-199ea2a82a74cf2f7b63078e2dd4b8274c061851.tar.gz | |
Support for icon-text-fit, icon-text-fit-padding (#5334)
* Add support for icon-text-fit
* Port unit tests for getIconQuads() from js => cpp
* Add support for padding in all 4 directions.
* Update all hashes post-merge
Diffstat (limited to 'src/mbgl/text/quads.hpp')
| -rw-r--r-- | src/mbgl/text/quads.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/text/quads.hpp b/src/mbgl/text/quads.hpp index 0ea5129238..dd64af682a 100644 --- a/src/mbgl/text/quads.hpp +++ b/src/mbgl/text/quads.hpp @@ -40,7 +40,7 @@ typedef std::vector<SymbolQuad> SymbolQuads; SymbolQuads getIconQuads(Anchor& anchor, const PositionedIcon& shapedIcon, const GeometryCoordinates& line, const style::SymbolLayoutProperties&, - const bool alongLine); + const bool alongLine, const Shaping& shapedText); SymbolQuads getGlyphQuads(Anchor& anchor, const Shaping& shapedText, const float boxScale, const GeometryCoordinates& line, const style::SymbolLayoutProperties&, |