Merge pull request #1317 from bradh/windows_fix_2024-09-21

tests: match tiffdecode test calls to signature
strukturag · Sep 21, 2024 · 76bb3dd · 76bb3dd
2 parents 416803a + 03b1da9
commit 76bb3dd
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/tests/tiffdecode.cc b/tests/tiffdecode.cc
@@ -44,13 +44,13 @@ void checkMono(InputImage input_image) {
   REQUIRE(heif_image_get_height(image, heif_channel_Y) == 64);
   REQUIRE(heif_image_get_bits_per_pixel(image, heif_channel_Y) == 8);
   REQUIRE(heif_image_get_bits_per_pixel_range(image, heif_channel_Y) == 8);
-  REQUIRE(heif_image_has_channel(image, heif_channel_Y) == true);
-  REQUIRE(heif_image_has_channel(image, heif_channel_R) == false);
-  REQUIRE(heif_image_has_channel(image, heif_channel_G) == false);
-  REQUIRE(heif_image_has_channel(image, heif_channel_B) == false);
-  REQUIRE(heif_image_has_channel(image, heif_channel_interleaved) == false);
-  REQUIRE(heif_image_has_channel(image, heif_channel_Cr) == false);
-  REQUIRE(heif_image_has_channel(image, heif_channel_Cb) == false);
+  REQUIRE(heif_image_has_channel(image, heif_channel_Y) == 1);
+  REQUIRE(heif_image_has_channel(image, heif_channel_R) == 0);
+  REQUIRE(heif_image_has_channel(image, heif_channel_G) == 0);
+  REQUIRE(heif_image_has_channel(image, heif_channel_B) == 0);
+  REQUIRE(heif_image_has_channel(image, heif_channel_interleaved) == 0);
+  REQUIRE(heif_image_has_channel(image, heif_channel_Cr) == 0);
+  REQUIRE(heif_image_has_channel(image, heif_channel_Cb) == 0);
 }
 
 TEST_CASE("mono8") {
@@ -79,13 +79,13 @@ void checkRGB(InputImage input_image) {
   REQUIRE(heif_image_get_height(image, heif_channel_interleaved) == 10);
   REQUIRE(heif_image_get_bits_per_pixel(image, heif_channel_interleaved) == 24);
   REQUIRE(heif_image_get_bits_per_pixel_range(image, heif_channel_interleaved) == 8);
-  REQUIRE(heif_image_has_channel(image, heif_channel_Y) == false);
-  REQUIRE(heif_image_has_channel(image, heif_channel_R) == false);
-  REQUIRE(heif_image_has_channel(image, heif_channel_G) == false);
-  REQUIRE(heif_image_has_channel(image, heif_channel_B) == false);
-  REQUIRE(heif_image_has_channel(image, heif_channel_interleaved) == true);
-  REQUIRE(heif_image_has_channel(image, heif_channel_Cr) == false);
-  REQUIRE(heif_image_has_channel(image, heif_channel_Cb) == false);
+  REQUIRE(heif_image_has_channel(image, heif_channel_Y) == 0);
+  REQUIRE(heif_image_has_channel(image, heif_channel_R) == 0);
+  REQUIRE(heif_image_has_channel(image, heif_channel_G) == 0);
+  REQUIRE(heif_image_has_channel(image, heif_channel_B) == 0);
+  REQUIRE(heif_image_has_channel(image, heif_channel_interleaved) == 1);
+  REQUIRE(heif_image_has_channel(image, heif_channel_Cr) == 0);
+  REQUIRE(heif_image_has_channel(image, heif_channel_Cb) == 0);
 }
 
 TEST_CASE("rgb") {
@@ -115,13 +115,13 @@ void checkRGBA(InputImage input_image) {
   REQUIRE(heif_image_get_height(image, heif_channel_interleaved) == 10);
   REQUIRE(heif_image_get_bits_per_pixel(image, heif_channel_interleaved) == 32);
   REQUIRE(heif_image_get_bits_per_pixel_range(image, heif_channel_interleaved) == 8);
-  REQUIRE(heif_image_has_channel(image, heif_channel_Y) == false);
-  REQUIRE(heif_image_has_channel(image, heif_channel_R) == false);
-  REQUIRE(heif_image_has_channel(image, heif_channel_G) == false);
-  REQUIRE(heif_image_has_channel(image, heif_channel_B) == false);
-  REQUIRE(heif_image_has_channel(image, heif_channel_interleaved) == true);
-  REQUIRE(heif_image_has_channel(image, heif_channel_Cr) == false);
-  REQUIRE(heif_image_has_channel(image, heif_channel_Cb) == false);
+  REQUIRE(heif_image_has_channel(image, heif_channel_Y) == 0);
+  REQUIRE(heif_image_has_channel(image, heif_channel_R) == 0);
+  REQUIRE(heif_image_has_channel(image, heif_channel_G) == 0);
+  REQUIRE(heif_image_has_channel(image, heif_channel_B) == 0);
+  REQUIRE(heif_image_has_channel(image, heif_channel_interleaved) == 1);
+  REQUIRE(heif_image_has_channel(image, heif_channel_Cr) == 0);
+  REQUIRE(heif_image_has_channel(image, heif_channel_Cb) == 0);
 }
 
 TEST_CASE("rgba") {