Support unpacking more rawmodes to RGBA palette

radarhere · radarhere · commit 4b5c1e871060 · 2024-04-22T09:24:28.000+10:00
diff --git a/Tests/test_image_putpalette.py b/Tests/test_image_putpalette.py
@@ -79,6 +79,7 @@ def test_putpalette_with_alpha_values() -> None:
     (
         ("RGBA", (1, 2, 3, 4)),
         ("RGBAX", (1, 2, 3, 4, 0)),
+        ("ARGB", (4, 1, 2, 3)),
     ),
 )
 def test_rgba_palette(mode: str, palette: tuple[int, ...]) -> None:
diff --git a/src/PIL/DdsImagePlugin.py b/src/PIL/DdsImagePlugin.py
@@ -379,6 +379,7 @@ def _open(self):
         elif pfflags & DDPF.PALETTEINDEXED8:
             self._mode = "P"
             self.palette = ImagePalette.raw("RGBA", self.fp.read(1024))
+            self.palette.mode = "RGBA"
         elif pfflags & DDPF.FOURCC:
             offset = header_size + 4
             if fourcc == D3DFMT.DXT1:
diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py
@@ -429,7 +429,7 @@ def load_prepare(self):
             self._prev_im = self.im
             if self._frame_palette:
                 self.im = Image.core.fill("P", self.size, self._frame_transparency or 0)
-                self.im.putpalette(*self._frame_palette.getdata())
+                self.im.putpalette("RGB", *self._frame_palette.getdata())
             else:
                 self.im = None
         self._mode = temp_mode
diff --git a/src/PIL/Image.py b/src/PIL/Image.py
@@ -851,7 +851,7 @@ def load(self):
         if self.im is not None and self.palette and self.palette.dirty:
             # realize palette
             mode, arr = self.palette.getdata()
-            self.im.putpalette(mode, arr)
+            self.im.putpalette(self.palette.mode, mode, arr)
             self.palette.dirty = 0
             self.palette.rawmode = None
             if "transparency" in self.info and mode in ("LA", "PA"):
@@ -861,9 +861,9 @@ def load(self):
                     self.im.putpalettealphas(self.info["transparency"])
                 self.palette.mode = "RGBA"
             else:
-                palette_mode = "RGBA" if mode.startswith("RGBA") else "RGB"
-                self.palette.mode = palette_mode
-                self.palette.palette = self.im.getpalette(palette_mode, palette_mode)
+                self.palette.palette = self.im.getpalette(
+                    self.palette.mode, self.palette.mode
+                )
 
         if self.im is not None:
             if cffi and USE_CFFI_ACCESS:
@@ -1968,7 +1968,7 @@ def putpalette(self, data, rawmode="RGB") -> None:
             palette = ImagePalette.raw(rawmode, data)
         self._mode = "PA" if "A" in self.mode else "P"
         self.palette = palette
-        self.palette.mode = "RGB"
+        self.palette.mode = "RGBA" if "A" in rawmode else "RGB"
         self.load()  # install new palette
 
     def putpixel(self, xy, value):
@@ -2083,7 +2083,7 @@ def remap_palette(self, dest_map, source_palette=None):
         # m_im.putpalette(mapping_palette, 'L')  # converts to 'P'
         # or just force it.
         # UNDONE -- this is part of the general issue with palettes
-        m_im.im.putpalette(palette_mode + ";L", m_im.palette.tobytes())
+        m_im.im.putpalette(palette_mode, palette_mode + ";L", m_im.palette.tobytes())
 
         m_im = m_im.convert("L")
 
diff --git a/src/_imaging.c b/src/_imaging.c
@@ -1715,10 +1715,10 @@ _putpalette(ImagingObject *self, PyObject *args) {
     ImagingShuffler unpack;
     int bits;
 
-    char *rawmode, *palette_mode;
+    char *palette_mode, *rawmode;
     UINT8 *palette;
     Py_ssize_t palettesize;
-    if (!PyArg_ParseTuple(args, "sy#", &rawmode, &palette, &palettesize)) {
+    if (!PyArg_ParseTuple(args, "ssy#", &palette_mode, &rawmode, &palette, &palettesize)) {
         return NULL;
     }
 
@@ -1728,7 +1728,6 @@ _putpalette(ImagingObject *self, PyObject *args) {
         return NULL;
     }
 
-    palette_mode = strncmp("RGBA", rawmode, 4) == 0 ? "RGBA" : "RGB";
     unpack = ImagingFindUnpacker(palette_mode, rawmode, &bits);
     if (!unpack) {
         PyErr_SetString(PyExc_ValueError, wrong_raw_mode);

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ def test_putpalette_with_alpha_values() -> None:`
`79`	`79`	`(`
`80`	`80`	`("RGBA", (1, 2, 3, 4)),`
`81`	`81`	`("RGBAX", (1, 2, 3, 4, 0)),`
	`82`	`+ ("ARGB", (4, 1, 2, 3)),`
`82`	`83`	`),`
`83`	`84`	`)`
`84`	`85`	`def test_rgba_palette(mode: str, palette: tuple[int, ...]) -> None:`