From 0b687312071305c050d97e04fef1c80193f443c5 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 7 Jun 2017 12:45:35 -0700
Subject: [core] Per-bucket icon atlases

---
 test/tile/annotation_tile.test.cpp | 6 +++---
 test/tile/geojson_tile.test.cpp    | 6 +++---
 test/tile/raster_tile.test.cpp     | 6 +++---
 test/tile/vector_tile.test.cpp     | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'test/tile')

diff --git a/test/tile/annotation_tile.test.cpp b/test/tile/annotation_tile.test.cpp
index 168dbf5292..8aa91b1517 100644
--- a/test/tile/annotation_tile.test.cpp
+++ b/test/tile/annotation_tile.test.cpp
@@ -12,7 +12,7 @@
 #include <mbgl/geometry/feature_index.hpp>
 #include <mbgl/annotation/annotation_manager.hpp>
 #include <mbgl/annotation/annotation_tile.hpp>
-#include <mbgl/sprite/sprite_atlas.hpp>
+#include <mbgl/renderer/image_manager.hpp>
 #include <mbgl/text/glyph_manager.hpp>
 
 #include <memory>
@@ -27,7 +27,7 @@ public:
     ThreadPool threadPool { 1 };
     AnnotationManager annotationManager;
     RenderStyle style { threadPool, fileSource };
-    SpriteAtlas spriteAtlas;
+    ImageManager imageManager;
     GlyphManager glyphManager { fileSource };
 
     TileParameters tileParameters {
@@ -38,7 +38,7 @@ public:
         fileSource,
         MapMode::Continuous,
         annotationManager,
-        spriteAtlas,
+        imageManager,
         glyphManager
     };
 };
diff --git a/test/tile/geojson_tile.test.cpp b/test/tile/geojson_tile.test.cpp
index 9a9fe9a78f..2aa85c3860 100644
--- a/test/tile/geojson_tile.test.cpp
+++ b/test/tile/geojson_tile.test.cpp
@@ -10,7 +10,7 @@
 #include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/style/layers/circle_layer.hpp>
 #include <mbgl/annotation/annotation_manager.hpp>
-#include <mbgl/sprite/sprite_atlas.hpp>
+#include <mbgl/renderer/image_manager.hpp>
 #include <mbgl/text/glyph_manager.hpp>
 
 #include <memory>
@@ -25,7 +25,7 @@ public:
     util::RunLoop loop;
     ThreadPool threadPool { 1 };
     AnnotationManager annotationManager;
-    SpriteAtlas spriteAtlas;
+    ImageManager imageManager;
     GlyphManager glyphManager { fileSource };
     Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
 
@@ -37,7 +37,7 @@ public:
         fileSource,
         MapMode::Continuous,
         annotationManager,
-        spriteAtlas,
+        imageManager,
         glyphManager
     };
 };
diff --git a/test/tile/raster_tile.test.cpp b/test/tile/raster_tile.test.cpp
index ba296c0360..a0666c2146 100644
--- a/test/tile/raster_tile.test.cpp
+++ b/test/tile/raster_tile.test.cpp
@@ -9,7 +9,7 @@
 #include <mbgl/annotation/annotation_manager.hpp>
 #include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/renderer/buckets/raster_bucket.hpp>
-#include <mbgl/sprite/sprite_atlas.hpp>
+#include <mbgl/renderer/image_manager.hpp>
 #include <mbgl/text/glyph_manager.hpp>
 
 using namespace mbgl;
@@ -21,7 +21,7 @@ public:
     util::RunLoop loop;
     ThreadPool threadPool { 1 };
     AnnotationManager annotationManager;
-    SpriteAtlas spriteAtlas;
+    ImageManager imageManager;
     GlyphManager glyphManager { fileSource };
     Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
 
@@ -33,7 +33,7 @@ public:
         fileSource,
         MapMode::Continuous,
         annotationManager,
-        spriteAtlas,
+        imageManager,
         glyphManager
     };
 };
diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp
index e1a1635bd3..c427a1a869 100644
--- a/test/tile/vector_tile.test.cpp
+++ b/test/tile/vector_tile.test.cpp
@@ -13,7 +13,7 @@
 #include <mbgl/text/collision_tile.hpp>
 #include <mbgl/geometry/feature_index.hpp>
 #include <mbgl/annotation/annotation_manager.hpp>
-#include <mbgl/sprite/sprite_atlas.hpp>
+#include <mbgl/renderer/image_manager.hpp>
 #include <mbgl/text/glyph_manager.hpp>
 
 #include <memory>
@@ -27,7 +27,7 @@ public:
     util::RunLoop loop;
     ThreadPool threadPool { 1 };
     AnnotationManager annotationManager;
-    SpriteAtlas spriteAtlas;
+    ImageManager imageManager;
     GlyphManager glyphManager { fileSource };
     Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
 
@@ -39,7 +39,7 @@ public:
         fileSource,
         MapMode::Continuous,
         annotationManager,
-        spriteAtlas,
+        imageManager,
         glyphManager
     };
 };
-- 
cgit v1.2.1