1 files changed, 21 insertions, 7 deletions

diff --git a/test/sprite/sprite_parser.cpp b/test/sprite/sprite_parser.cpp
index 54c013e936..177662db43 100644
--- a/test/sprite/sprite_parser.cpp
+++ b/test/sprite/sprite_parser.cpp
@@ -11,6 +11,14 @@
 
 using namespace mbgl;
 
+namespace {
+
+auto readImage(const std::string& name) {
+    return decodeImage(util::read_file(name));
+}
+
+} // namespace
+
 TEST(Sprite, SpriteImageCreationInvalid) {
     FixtureLog log;
 
@@ -48,7 +56,8 @@ TEST(Sprite, SpriteImageCreation1x) {
         EXPECT_EQ(18, sprite->image.width);
         EXPECT_EQ(18, sprite->image.height);
         EXPECT_EQ(1, sprite->pixelRatio);
-        EXPECT_EQ(0x7FCC5F263D1FFE16u, test::crc64(sprite->image));
+        EXPECT_EQ(readImage("test/fixtures/annotations/result-spriteimagecreation1x-museum.png"),
+                  sprite->image);
     }
 
     { // outside image == blank
@@ -59,7 +68,8 @@ TEST(Sprite, SpriteImageCreation1x) {
         EXPECT_EQ(16, sprite->image.width);
         EXPECT_EQ(16, sprite->image.height);
         EXPECT_EQ(1, sprite->pixelRatio);
-        EXPECT_EQ(0x0000000000000000u, test::crc64(sprite->image)) << std::hex << test::crc64(sprite->image);
+        EXPECT_EQ(readImage("test/fixtures/annotations/result-spriteimagecreation1x-blank.png"),
+                  sprite->image);
     }
 
     { // outside image == blank
@@ -70,7 +80,8 @@ TEST(Sprite, SpriteImageCreation1x) {
         EXPECT_EQ(16, sprite->image.width);
         EXPECT_EQ(16, sprite->image.height);
         EXPECT_EQ(1, sprite->pixelRatio);
-        EXPECT_EQ(0x0000000000000000u, test::crc64(sprite->image)) << std::hex << test::crc64(sprite->image);
+        EXPECT_EQ(readImage("test/fixtures/annotations/result-spriteimagecreation1x-blank.png"),
+                  sprite->image);
     }
 }
 
@@ -85,7 +96,8 @@ TEST(Sprite, SpriteImageCreation2x) {
     EXPECT_EQ(36, sprite->image.width);
     EXPECT_EQ(36, sprite->image.height);
     EXPECT_EQ(2, sprite->pixelRatio);
-    EXPECT_EQ(0x85F345098DD4F9E3u, test::crc64(sprite->image));
+    EXPECT_EQ(readImage("test/fixtures/annotations/result-spriteimagecreation2x.png"),
+              sprite->image);
 }
 
 TEST(Sprite, SpriteImageCreation1_5x) {
@@ -99,7 +111,8 @@ TEST(Sprite, SpriteImageCreation1_5x) {
     EXPECT_EQ(36, sprite->image.width);
     EXPECT_EQ(36, sprite->image.height);
     EXPECT_EQ(1.5, sprite->pixelRatio);
-    EXPECT_EQ(0x85F345098DD4F9E3u, test::crc64(sprite->image));
+    EXPECT_EQ(readImage("test/fixtures/annotations/result-spriteimagecreation1_5x-museum.png"),
+              sprite->image);
 
     // "hospital_icon":{"x":314,"y":518,"width":36,"height":36,"pixelRatio":2,"sdf":false}
     const auto sprite2 = createSpriteImage(image_2x, 314, 518, 35, 35, 1.5, false);
@@ -109,7 +122,8 @@ TEST(Sprite, SpriteImageCreation1_5x) {
     EXPECT_EQ(35, sprite2->image.width);
     EXPECT_EQ(35, sprite2->image.height);
     EXPECT_EQ(1.5, sprite2->pixelRatio);
-    EXPECT_EQ(14312995667113444493u, test::crc64(sprite2->image));
+    EXPECT_EQ(readImage("test/fixtures/annotations/result-spriteimagecreation1_5x-hospital.png"),
+              sprite2->image);
 }
 
 TEST(Sprite, SpriteParsing) {
@@ -204,7 +218,7 @@ TEST(Sprite, SpriteParsing) {
         EXPECT_EQ(18, sprite->image.width);
         EXPECT_EQ(18, sprite->image.height);
         EXPECT_EQ(1, sprite->pixelRatio);
-        EXPECT_EQ(0xFF56F5F48F707147u, test::crc64(sprite->image));
+        EXPECT_EQ(readImage("test/fixtures/annotations/result-spriteparsing.png"), sprite->image);
     }
 }