summaryrefslogtreecommitdiff
path: root/src/mbgl/text/shaping.cpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2019-12-10 13:38:36 +0100
committerAlexander Shalamov <alexander.shalamov@mapbox.com>2020-01-15 15:02:11 +0200
commit027e803b722301a03e9ef53b584c2795ff47e7bd (patch)
treed40e718688a00980ad5c40dc5db7200fb732410a /src/mbgl/text/shaping.cpp
parent1342cb44b3f8bb0cd5c019174b62886b84d62cf8 (diff)
downloadqtlocation-mapboxgl-027e803b722301a03e9ef53b584c2795ff47e7bd.tar.gz
[core] move icon rotation from shaping to quad generation to mirror JS
Diffstat (limited to 'src/mbgl/text/shaping.cpp')
-rw-r--r--src/mbgl/text/shaping.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mbgl/text/shaping.cpp b/src/mbgl/text/shaping.cpp
index 2b23deadea..033cbdf4e5 100644
--- a/src/mbgl/text/shaping.cpp
+++ b/src/mbgl/text/shaping.cpp
@@ -70,8 +70,7 @@ style::TextJustifyType getAnchorJustification(style::SymbolAnchorType anchor) {
PositionedIcon PositionedIcon::shapeIcon(const ImagePosition& image,
const std::array<float, 2>& iconOffset,
- style::SymbolAnchorType iconAnchor,
- const float iconRotation) {
+ style::SymbolAnchorType iconAnchor) {
AnchorAlignment anchorAlign = AnchorAlignment::getAnchorAlignment(iconAnchor);
float dx = iconOffset[0];
float dy = iconOffset[1];
@@ -80,7 +79,7 @@ PositionedIcon PositionedIcon::shapeIcon(const ImagePosition& image,
float top = dy - image.displaySize()[1] * anchorAlign.verticalAlign;
float bottom = top + image.displaySize()[1];
- return PositionedIcon { image, top, bottom, left, right, iconRotation };
+ return PositionedIcon{image, top, bottom, left, right};
}
void PositionedIcon::fitIconToText(const Shaping& shapedText,