From 8ae70105463db78699ef3743fb24503ed8feb054 Mon Sep 17 00:00:00 2001
From: Asheem Mamoowala <asheem.mamoowala@mapbox.com>
Date: Tue, 11 Jul 2017 14:31:05 -0700
Subject: [core][ios][android][macos] Use premultiplied image directly for
 RasterTile and ImageSource, un-premultiply in the shader for blending

---
 test/gl/bucket.test.cpp        | 2 +-
 test/style/source.test.cpp     | 2 +-
 test/tile/raster_tile.test.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/gl/bucket.test.cpp b/test/gl/bucket.test.cpp
index 24bec0bd22..7ff67f40d0 100644
--- a/test/gl/bucket.test.cpp
+++ b/test/gl/bucket.test.cpp
@@ -101,7 +101,7 @@ TEST(Buckets, SymbolBucket) {
 
 TEST(Buckets, RasterBucket) {
     gl::Context context;
-    UnassociatedImage rgba({ 1, 1 });
+    PremultipliedImage rgba({ 1, 1 });
 
     // RasterBucket::hasData() is always true.
     RasterBucket bucket = { std::move(rgba) };
diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp
index d576dc1e4a..8b9cda1db3 100644
--- a/test/style/source.test.cpp
+++ b/test/style/source.test.cpp
@@ -531,7 +531,7 @@ TEST(Source, ImageSourceImageUpdate) {
 
     // Load initial, so the source state will be loaded=true
     source.loadDescription(test.fileSource);
-    UnassociatedImage rgba({ 1, 1 });
+    PremultipliedImage rgba({ 1, 1 });
     rgba.data[0] = 255;
     rgba.data[1] = 254;
     rgba.data[2] = 253;
diff --git a/test/tile/raster_tile.test.cpp b/test/tile/raster_tile.test.cpp
index 025208c331..4680e7f485 100644
--- a/test/tile/raster_tile.test.cpp
+++ b/test/tile/raster_tile.test.cpp
@@ -60,7 +60,7 @@ TEST(RasterTile, onError) {
 TEST(RasterTile, onParsed) {
     RasterTileTest test;
     RasterTile tile(OverscaledTileID(0, 0, 0), test.tileParameters, test.tileset);
-    tile.onParsed(std::make_unique<RasterBucket>(UnassociatedImage{}));
+    tile.onParsed(std::make_unique<RasterBucket>(PremultipliedImage{}));
     EXPECT_TRUE(tile.isRenderable());
     EXPECT_TRUE(tile.isLoaded());
     EXPECT_TRUE(tile.isComplete());
-- 
cgit v1.2.1