1 files changed, 13 insertions, 13 deletions
diff --git a/src/mbgl/text/shaping.hpp b/src/mbgl/text/shaping.hpp
index b7eee5a5db..0a961849e5 100644
--- a/src/mbgl/text/shaping.hpp
+++ b/src/mbgl/text/shaping.hpp
@@ -1,32 +1,30 @@
 #pragma once
 
 #include <mbgl/text/glyph.hpp>
-#include <mbgl/sprite/sprite_atlas.hpp>
-#include <mbgl/style/image.hpp>
-#include <mbgl/util/optional.hpp>
+#include <mbgl/renderer/image_atlas.hpp>
+#include <mbgl/style/types.hpp>
 
 namespace mbgl {
 
-class SpriteAtlasElement;
 class SymbolFeature;
 class BiDi;
 
 class PositionedIcon {
 private:
-    PositionedIcon(const SpriteAtlasElement& image_,
+    PositionedIcon(ImagePosition image_,
                    float top_,
                    float bottom_,
                    float left_,
                    float right_,
                    float angle_)
-        : _image(image_),
+        : _image(std::move(image_)),
           _top(top_),
           _bottom(bottom_),
           _left(left_),
           _right(right_),
           _angle(angle_) {}
 
-    optional<SpriteAtlasElement> _image;
+    ImagePosition _image;
     float _top;
     float _bottom;
     float _left;
@@ -34,9 +32,12 @@ private:
     float _angle;
 
 public:
-    static optional<PositionedIcon> shapeIcon(const class SpriteAtlasElement&, const std::array<float, 2>& iconOffset, const float iconRotation);
+    static PositionedIcon shapeIcon(const ImagePosition&,
+                                    const std::array<float, 2>& iconOffset,
+                                    style::SymbolAnchorType iconAnchor,
+                                    const float iconRotation);
 
-    optional<class SpriteAtlasElement> image() const { return _image; }
+    const ImagePosition& image() const { return _image; }
     float top() const { return _top; }
     float bottom() const { return _bottom; }
     float left() const { return _left; }
@@ -47,14 +48,13 @@ public:
 const Shaping getShaping(const std::u16string& string,
                          float maxWidth,
                          float lineHeight,
-                         float horizontalAlign,
-                         float verticalAlign,
-                         float justify,
+                         style::SymbolAnchorType textAnchor,
+                         style::TextJustifyType textJustify,
                          float spacing,
                          const Point<float>& translate,
                          float verticalHeight,
                          const WritingModeType,
                          BiDi& bidi,
-                         const GlyphPositions& glyphs);
+                         const Glyphs& glyphs);
 
 } // namespace mbgl