[all] Rationalize style::Image

A style has a collection of images, just as it has collections of sources and layers.

* Name things appropriately
* Use std::unique_ptr

1 files changed, 3 insertions, 5 deletions

diff --git a/test/api/query.test.cpp b/test/api/query.test.cpp
index 532cc14d28..77dc095484 100644
--- a/test/api/query.test.cpp
+++ b/test/api/query.test.cpp
@@ -3,12 +3,12 @@
 #include <mbgl/gl/headless_backend.hpp>
 #include <mbgl/gl/offscreen_view.hpp>
 #include <mbgl/util/default_thread_pool.hpp>
-#include <mbgl/sprite/sprite_image.hpp>
 #include <mbgl/test/stub_file_source.hpp>
 #include <mbgl/test/util.hpp>
 #include <mbgl/util/image.hpp>
 #include <mbgl/util/io.hpp>
 #include <mbgl/util/run_loop.hpp>
+#include <mbgl/style/image.hpp>
 #include <mbgl/style/source.hpp>
 
 using namespace mbgl;
@@ -19,11 +19,9 @@ namespace {
 class QueryTest {
 public:
     QueryTest() {
-        auto decoded = decodeImage(util::read_file("test/fixtures/sprites/default_marker.png"));
-        auto image = std::make_unique<SpriteImage>(std::move(decoded), 1.0);
-
         map.setStyleJSON(util::read_file("test/fixtures/api/query_style.json"));
-        map.addImage("test-icon", std::move(image));
+        map.addImage("test-icon", std::make_unique<style::Image>(
+            decodeImage(util::read_file("test/fixtures/sprites/default_marker.png")), 1.0));
 
         test::render(map, view);
     }