diff options
| author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-11-19 11:50:55 +0200 |
|---|---|---|
| committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-12-02 17:11:49 +0200 |
| commit | 614000256b709ff9d566740534f68c4cb795e0f2 (patch) | |
| tree | 59271e9aa68699dd3ecc866f8b47983bf7394cbc /src/mbgl/text | |
| parent | 33ba4052b67436b09f1dff21991673f6ea37275e (diff) | |
| download | qtlocation-mapboxgl-614000256b709ff9d566740534f68c4cb795e0f2.tar.gz | |
[core] Shape images in labels at bucket zoom level
Diffstat (limited to 'src/mbgl/text')
| -rw-r--r-- | src/mbgl/text/shaping.cpp | 3 | ||||
| -rw-r--r-- | src/mbgl/text/shaping.hpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mbgl/text/shaping.cpp b/src/mbgl/text/shaping.cpp index b977112d1f..fb1aa04346 100644 --- a/src/mbgl/text/shaping.cpp +++ b/src/mbgl/text/shaping.cpp @@ -532,6 +532,7 @@ const Shaping getShaping(const TaggedString& formattedString, const GlyphPositions& glyphPositions, const ImagePositions& imagePositions, float layoutTextSize, + float layoutTextSizeAtBucketZoomLevel, bool allowVerticalPlacement) { assert(layoutTextSize); std::vector<TaggedString> reorderedLines; @@ -561,7 +562,7 @@ const Shaping getShaping(const TaggedString& formattedString, glyphMap, glyphPositions, imagePositions, - layoutTextSize, + layoutTextSizeAtBucketZoomLevel, allowVerticalPlacement); return shaping; diff --git a/src/mbgl/text/shaping.hpp b/src/mbgl/text/shaping.hpp index c170642e82..1f62f38521 100644 --- a/src/mbgl/text/shaping.hpp +++ b/src/mbgl/text/shaping.hpp @@ -73,6 +73,7 @@ const Shaping getShaping(const TaggedString& string, const GlyphPositions& glyphPositions, const ImagePositions& imagePositions, float layoutTextSize, + float layoutTextSizeAtBucketZoomLevel, bool allowVerticalPlacement); } // namespace mbgl |