[core] Immutable<Impl> for Image

2 files changed, 5 insertions, 5 deletions

diff --git a/src/mbgl/style/image.cpp b/src/mbgl/style/image.cpp
index c5fecec2b2..606d9907a4 100644
--- a/src/mbgl/style/image.cpp
+++ b/src/mbgl/style/image.cpp
@@ -8,11 +8,10 @@ namespace style {
 Image::Image(PremultipliedImage &&image,
              const float pixelRatio,
              bool sdf)
-        : impl(std::make_shared<Impl>(std::move(image), pixelRatio, sdf)) {
+    : impl(makeMutable<Impl>(std::move(image), pixelRatio, sdf)) {
 }
 
-PremultipliedImage& Image::getImage() const {
-    assert(impl);
+const PremultipliedImage& Image::getImage() const {
     return impl->image;
 }
 
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index ae9ed97427..256949af3b 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -544,7 +544,7 @@ bool Style::isLoaded() const {
 
 void Style::addImage(const std::string& id, std::unique_ptr<style::Image> image) {
     addSpriteImage(spriteImages, id, std::move(image), [&](style::Image& added) {
-        spriteAtlas->addImage(id, std::make_unique<style::Image>(added));
+        spriteAtlas->addImage(id, added.impl);
         observer->onUpdate(Update::Repaint);
     });
 }
@@ -557,7 +557,8 @@ void Style::removeImage(const std::string& id) {
 }
 
 const style::Image* Style::getImage(const std::string& id) const {
-    return spriteAtlas->getImage(id);
+    auto it = spriteImages.find(id);
+    return it == spriteImages.end() ? nullptr : it->second.get();
 }
 
 RenderData Style::getRenderData(MapDebugOptions debugOptions, float angle) const {