[core][ios][osx][android] make SpriteImage accept PremultipliedImage

the SpriteImage constructor signature changes from

SpriteImage(
        uint16_t width, uint16_t height, float pixelRatio,
        std::string&& data, bool sdf = false);

to

SpriteImage(PremultipliedImage&&, float pixelRatio, bool sdf = false)

1 files changed, 3 insertions, 3 deletions

diff --git a/src/mbgl/sprite/sprite_atlas.hpp b/src/mbgl/sprite/sprite_atlas.hpp
index f577004704..73b3037ec6 100644
--- a/src/mbgl/sprite/sprite_atlas.hpp
+++ b/src/mbgl/sprite/sprite_atlas.hpp
@@ -32,7 +32,7 @@ struct SpriteAtlasPosition {
 
 struct SpriteAtlasElement {
     Rect<uint16_t> pos;
-    std::shared_ptr<const SpriteImage> texture;
+    std::shared_ptr<const SpriteImage> spriteImage;
     float relativePixelRatio;
 };
 
@@ -77,13 +77,13 @@ private:
     struct Holder : private util::noncopyable {
         inline Holder(const std::shared_ptr<const SpriteImage>&, const Rect<dimension>&);
         inline Holder(Holder&&);
-        std::shared_ptr<const SpriteImage> texture;
+        std::shared_ptr<const SpriteImage> spriteImage;
         const Rect<dimension> pos;
     };
 
     using Key = std::pair<std::string, bool>;
 
-    Rect<SpriteAtlas::dimension> allocateImage(float width, float height);
+    Rect<SpriteAtlas::dimension> allocateImage(const SpriteImage&);
     void copy(const Holder& holder, const bool wrap);
 
     std::recursive_mutex mtx;