diff options
Diffstat (limited to 'src/mbgl')
| -rw-r--r-- | src/mbgl/layout/symbol_instance.cpp | 5 | ||||
| -rw-r--r-- | src/mbgl/text/quads.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/text/quads.hpp | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/mbgl/layout/symbol_instance.cpp b/src/mbgl/layout/symbol_instance.cpp index 5c92d2f678..3a16d25de6 100644 --- a/src/mbgl/layout/symbol_instance.cpp +++ b/src/mbgl/layout/symbol_instance.cpp @@ -31,10 +31,9 @@ SymbolInstanceSharedData::SymbolInstanceSharedData(GeometryCoordinates line_, : line(std::move(line_)) { // Create the quads used for rendering the icon and glyphs. if (shapedIcon) { - iconQuads = getIconQuads(*shapedIcon, getAnyShaping(shapedTextOrientations).writingMode, iconType); + iconQuads = getIconQuads(*shapedIcon, iconType); if (verticallyShapedIcon) { - verticalIconQuads = - getIconQuads(*verticallyShapedIcon, shapedTextOrientations.vertical.writingMode, iconType); + verticalIconQuads = getIconQuads(*verticallyShapedIcon, iconType); } } diff --git a/src/mbgl/text/quads.cpp b/src/mbgl/text/quads.cpp index 9d4e83c0d6..fe683f7d98 100644 --- a/src/mbgl/text/quads.cpp +++ b/src/mbgl/text/quads.cpp @@ -14,7 +14,7 @@ namespace mbgl { using namespace style; -SymbolQuads getIconQuads(const PositionedIcon& shapedIcon, WritingModeType writingMode, SymbolContent iconType) { +SymbolQuads getIconQuads(const PositionedIcon& shapedIcon, SymbolContent iconType) { const ImagePosition& image = shapedIcon.image(); // If you have a 10px icon that isn't perfectly aligned to the pixel grid it will cover 11 actual @@ -65,7 +65,7 @@ SymbolQuads getIconQuads(const PositionedIcon& shapedIcon, WritingModeType writi bl, br, image.paddedRect, - writingMode, + WritingModeType::None, {0.0f, 0.0f}, iconType == SymbolContent::IconSDF, pixelOffsetTL, diff --git a/src/mbgl/text/quads.hpp b/src/mbgl/text/quads.hpp index b6d2687d07..aa1913204e 100644 --- a/src/mbgl/text/quads.hpp +++ b/src/mbgl/text/quads.hpp @@ -57,7 +57,7 @@ public: using SymbolQuads = std::vector<SymbolQuad>; -SymbolQuads getIconQuads(const PositionedIcon& shapedIcon, WritingModeType writingMode, SymbolContent iconType); +SymbolQuads getIconQuads(const PositionedIcon& shapedIcon, SymbolContent iconType); SymbolQuads getGlyphQuads(const Shaping& shapedText, const std::array<float, 2> textOffset, |