Support RGB bitcount 8

radarhere · Oct 25, 2023 · c509876 · c509876
1 parent f58f410
commit c509876
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/Tests/images/rgb8.dds b/Tests/images/rgb8.dds
diff --git a/Tests/test_file_dds.py b/Tests/test_file_dds.py
@@ -340,6 +340,12 @@ def test_open(mode, test_file):
         assert_image_equal_tofile(im, test_file.replace(".dds", ".png"))
 
 
+def test_open_rgb8():
+    with Image.open("Tests/images/rgb8.dds") as im:
+        assert im.mode == "L"
+        assert_image_equal_tofile(im, "Tests/images/mode-l.png")
+
+
 @pytest.mark.parametrize(
     ("mode", "test_file"),
     [

diff --git a/src/PIL/DdsImagePlugin.py b/src/PIL/DdsImagePlugin.py
@@ -353,21 +353,22 @@ def _open(self):
         if pfflags & DDPF.RGB:
             # Texture contains uncompressed RGB data
             masks = {mask: ["R", "G", "B", "A"][i] for i, mask in enumerate(masks)}
-            if bitcount == 24:
+            if bitcount == 8:
+                self._mode = "L"
+            elif bitcount == 24:
                 self._mode = "RGB"
-                rawmode = masks[0x00FF0000] + masks[0x0000FF00] + masks[0x000000FF]
+                rawmode =  masks[0x000000FF] + masks[0x0000FF00] + masks[0x00FF0000]
             elif bitcount == 32 and pfflags & DDPF.ALPHAPIXELS:
                 self._mode = "RGBA"
                 rawmode = (
+                    masks[0x000000FF] +
+                    masks[0x0000FF00] +
+                    masks[0x00FF0000] +
                     masks[0xFF000000]
-                    + masks[0x00FF0000]
-                    + masks[0x0000FF00]
-                    + masks[0x000000FF]
                 )
             else:
                 msg = f"Unsupported bitcount {bitcount} for {pfflags}"
                 raise OSError(msg)
-            rawmode = rawmode[::-1]
         elif pfflags & DDPF.LUMINANCE:
             if bitcount == 8:
                 self._mode = "L"