From 82735d77d5e3c12e962cba2c6008f414779957ca Mon Sep 17 00:00:00 2001
From: Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>
Date: Mon, 1 Jul 2019 21:45:53 +0300
Subject: [core] Introduce ImageManager::getSharedImage

---
 src/mbgl/renderer/image_manager.cpp | 9 ++++++++-
 src/mbgl/renderer/image_manager.hpp | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/mbgl/renderer/image_manager.cpp b/src/mbgl/renderer/image_manager.cpp
index ff4c20eefb..3c22cdcf32 100644
--- a/src/mbgl/renderer/image_manager.cpp
+++ b/src/mbgl/renderer/image_manager.cpp
@@ -84,9 +84,16 @@ void ImageManager::removeImage(const std::string& id) {
 }
 
 const style::Image::Impl* ImageManager::getImage(const std::string& id) const {
+    if (auto* image = getSharedImage(id)) {
+        return image->get();
+    }
+    return nullptr;
+}
+
+const Immutable<style::Image::Impl>* ImageManager::getSharedImage(const std::string& id) const {
     const auto it = images.find(id);
     if (it != images.end()) {
-        return it->second.get();
+        return &(it->second);
     }
     return nullptr;
 }
diff --git a/src/mbgl/renderer/image_manager.hpp b/src/mbgl/renderer/image_manager.hpp
index 5305358513..9097418681 100644
--- a/src/mbgl/renderer/image_manager.hpp
+++ b/src/mbgl/renderer/image_manager.hpp
@@ -36,6 +36,7 @@ public:
     void dumpDebugLogs() const;
 
     const style::Image::Impl* getImage(const std::string&) const;
+    const Immutable<style::Image::Impl>* getSharedImage(const std::string&) const;
 
     void addImage(Immutable<style::Image::Impl>);
     bool updateImage(Immutable<style::Image::Impl>);
-- 
cgit v1.2.1