From 1045934d5e62eaf85bc280ce2d75e7558f5a5104 Mon Sep 17 00:00:00 2001
From: Roman Blum <rmnblm@gmail.com>
Date: Tue, 6 Dec 2016 02:16:13 +0100
Subject: [core, ios, macos] Add image accessor to MGLStyle (#7096)

* [core] Add interface to get image from sprite atlas

* [tests] Add tests for Map::getImage

* [ios, macos] WIP: get MGLImage for name from style

* [ios, macos] Fixed -imageForName:

Convert from sprite images to platform images using the existing encodePNG() function, which is also used for printing. Allow -imageForName: to return nil without an assertion failure. Added a basic test.
---
 include/mbgl/map/map.hpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include/mbgl/map')

diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 10153c54e3..092cfbe291 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -171,6 +171,7 @@ public:
     // Add image, bound to the style
     void addImage(const std::string&, std::unique_ptr<const SpriteImage>);
     void removeImage(const std::string&);
+    const SpriteImage* getImage(const std::string&);
 
     // Defaults
     std::string getStyleName() const;
-- 
cgit v1.2.1


From 18730d598d29cf876064ce6964ef88ef0351f78f Mon Sep 17 00:00:00 2001
From: Ivo van Dongen <info@ivovandongen.nl>
Date: Tue, 6 Dec 2016 17:24:32 +0100
Subject: [core] use raii to guard backend deactivation

---
 include/mbgl/map/backend.hpp | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

(limited to 'include/mbgl/map')

diff --git a/include/mbgl/map/backend.hpp b/include/mbgl/map/backend.hpp
index c11d094906..0468449155 100644
--- a/include/mbgl/map/backend.hpp
+++ b/include/mbgl/map/backend.hpp
@@ -10,6 +10,8 @@ namespace gl {
 class Context;
 } // namespace gl
 
+class BackendScope;
+
 class Backend {
 public:
     Backend();
@@ -18,6 +20,14 @@ public:
     // Returns the backend's context which manages OpenGL state.
     gl::Context& getContext();
 
+    // Called when the map needs to be rendered; the backend should call Map::render() at some point
+    // in the near future. (Not called for Map::renderStill() mode.)
+    virtual void invalidate() = 0;
+
+    // Notifies a watcher of map x/y/scale/rotation changes.
+    virtual void notifyMapChange(MapChange change);
+
+protected:
     // Called when the backend's GL context needs to be made active or inactive. These are called,
     // as a matched pair, in four situations:
     //
@@ -31,15 +41,24 @@ public:
     virtual void activate() = 0;
     virtual void deactivate() = 0;
 
-    // Called when the map needs to be rendered; the backend should call Map::render() at some point
-    // in the near future. (Not called for Map::renderStill() mode.)
-    virtual void invalidate() = 0;
+private:
+    const std::unique_ptr<gl::Context> context;
 
-    // Notifies a watcher of map x/y/scale/rotation changes.
-    virtual void notifyMapChange(MapChange change);
+    friend class BackendScope;
+};
+
+class BackendScope {
+public:
+    BackendScope(Backend& backend_) : backend(backend_) {
+        backend.activate();
+    }
+
+    ~BackendScope() {
+        backend.deactivate();
+    }
 
 private:
-    const std::unique_ptr<gl::Context> context;
+    Backend& backend;
 };
 
 } // namespace mbgl
-- 
cgit v1.2.1