Test BC1_UNORM and BC1_TYPELESS

radarhere · Oct 30, 2023 · e3ff5eb · e3ff5eb
1 parent 17be898
commit e3ff5eb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/Tests/images/bc1.dds b/Tests/images/bc1.dds
diff --git a/Tests/images/bc1_typeless.dds b/Tests/images/bc1_typeless.dds
diff --git a/Tests/test_file_dds.py b/Tests/test_file_dds.py
@@ -15,6 +15,8 @@
 TEST_FILE_DX10_BC5_TYPELESS = "Tests/images/bc5_typeless.dds"
 TEST_FILE_DX10_BC5_UNORM = "Tests/images/bc5_unorm.dds"
 TEST_FILE_DX10_BC5_SNORM = "Tests/images/bc5_snorm.dds"
+TEST_FILE_DX10_BC1 = "Tests/images/bc1.dds"
+TEST_FILE_DX10_BC1_TYPELESS = "Tests/images/bc1_typeless.dds"
 TEST_FILE_BC5S = "Tests/images/bc5s.dds"
 TEST_FILE_BC5U = "Tests/images/bc5u.dds"
 TEST_FILE_BC6H = "Tests/images/bc6h.dds"
@@ -29,11 +31,20 @@
 TEST_FILE_UNCOMPRESSED_RGB_WITH_ALPHA = "Tests/images/uncompressed_rgb.dds"
 
 
-def test_sanity_dxt1():
+@pytest.mark.parametrize(
+    "image_path",
+    (
+        TEST_FILE_DXT1,
+        # hexeditted to use DX10 FourCC
+        TEST_FILE_DX10_BC1,
+        TEST_FILE_DX10_BC1_TYPELESS,
+    ),
+)
+def test_sanity_bc1(image_path):
     """Check DXT1 images can be opened"""
     with Image.open(TEST_FILE_DXT1.replace(".dds", ".png")) as target:
         target = target.convert("RGBA")
-    with Image.open(TEST_FILE_DXT1) as im:
+    with Image.open(image_path) as im:
         im.load()
 
         assert im.format == "DDS"

diff --git a/src/PIL/DdsImagePlugin.py b/src/PIL/DdsImagePlugin.py
@@ -411,7 +411,6 @@ def _open(self):
                 self.fp.read(16)
                 if dxgi_format in (
                     DXGI_FORMAT.BC1_UNORM,
-                    DXGI_FORMAT.BC1_UNORM_SRGB,
                     DXGI_FORMAT.BC1_TYPELESS,
                 ):
                     self._mode = "RGBA"