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/renderer/symbol_bucket.cpp | |
| 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/renderer/symbol_bucket.cpp')
| -rw-r--r-- | src/mbgl/renderer/symbol_bucket.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp index 60624fa59e..e34aedb47e 100644 --- a/src/mbgl/renderer/symbol_bucket.cpp +++ b/src/mbgl/renderer/symbol_bucket.cpp @@ -51,7 +51,7 @@ SymbolInstance::SymbolInstance(Anchor& anchor, const GeometryCoordinates& line, // Create the quad used for rendering the icon. iconQuads(addToBuffers && shapedIcon ? - getIconQuads(anchor, shapedIcon, line, layout, iconAlongLine) : + getIconQuads(anchor, shapedIcon, line, layout, iconAlongLine, shapedText) : SymbolQuads()), // Create the collision features that will be used to check whether this symbol instance can be placed |