summaryrefslogtreecommitdiff
path: root/src/mbgl/text
diff options
context:
space:
mode:
authorAlexander Shalamov <alexander.shalamov@mapbox.com>2019-11-19 11:50:55 +0200
committerAlexander Shalamov <alexander.shalamov@mapbox.com>2019-12-02 12:08:37 +0200
commit5695a3c68be49f1b1d89e0ed02905f8ecf2f30ed (patch)
treeff4be678405d55d76c9b1aa1d2c99206a5f8cc15 /src/mbgl/text
parent6e0c9eae5715b08d5152cd4bdc65224ce5f52b6e (diff)
downloadqtlocation-mapboxgl-5695a3c68be49f1b1d89e0ed02905f8ecf2f30ed.tar.gz
[core] Shape images in labels at bucket zoom level
Diffstat (limited to 'src/mbgl/text')
-rw-r--r--src/mbgl/text/shaping.cpp3
-rw-r--r--src/mbgl/text/shaping.hpp1
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