Merge pull request #1 from radarhere/bc4-dds

Added test images
python-pillow · Dec 5, 2023 · 8a88e43 · 8a88e43
2 parents 8c5d5c7 + 0e36c14
commit 8a88e43
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/Tests/images/bc4_typeless.dds b/Tests/images/bc4_typeless.dds
diff --git a/Tests/images/bc4_unorm.png b/Tests/images/bc4_unorm.png
diff --git a/Tests/test_file_dds.py b/Tests/test_file_dds.py
@@ -12,6 +12,7 @@
 TEST_FILE_DXT5 = "Tests/images/dxt5-argb-8bbp-interpolatedalpha_MipMaps-1.dds"
 TEST_FILE_ATI1 = "Tests/images/ati1.dds"
 TEST_FILE_ATI2 = "Tests/images/ati2.dds"
+TEST_FILE_DX10_BC4_TYPELESS = "Tests/images/bc4_typeless.dds"
 TEST_FILE_DX10_BC4_UNORM = "Tests/images/bc4_unorm.dds"
 TEST_FILE_DX10_BC5_TYPELESS = "Tests/images/bc5_typeless.dds"
 TEST_FILE_DX10_BC5_UNORM = "Tests/images/bc5_unorm.dds"
@@ -83,16 +84,26 @@ def test_sanity_ati1():
         assert_image_equal_tofile(im, TEST_FILE_ATI1.replace(".dds", ".png"))
 
 
-def test_dx10_bc4():
+@pytest.mark.parametrize(
+    "image_path",
+    (
+        TEST_FILE_DX10_BC4_UNORM,
+        # hexeditted to be typeless
+        TEST_FILE_DX10_BC4_TYPELESS,
+    ),
+)
+def test_dx10_bc4(image_path):
     """Check DX10 BC4 images can be opened"""
 
-    with Image.open(TEST_FILE_DX10_BC4_UNORM) as im:
+    with Image.open(image_path) as im:
         im.load()
 
         assert im.format == "DDS"
         assert im.mode == "L"
         assert im.size == (64, 64)
 
+        assert_image_equal_tofile(im, TEST_FILE_DX10_BC4_UNORM.replace(".dds", ".png"))
+
 
 @pytest.mark.parametrize(
     "image_path",