Skip to content

Commit 9c7ba24

Browse files
authored
Merge pull request #7966 from radarhere/palette
Support unpacking more rawmodes to RGBA palettes
2 parents 0201707 + 2dedeef commit 9c7ba24

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

Tests/test_image_putpalette.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ def test_putpalette_with_alpha_values() -> None:
7979
(
8080
("RGBA", (1, 2, 3, 4)),
8181
("RGBAX", (1, 2, 3, 4, 0)),
82+
("ARGB", (4, 1, 2, 3)),
8283
),
8384
)
8485
def test_rgba_palette(mode: str, palette: tuple[int, ...]) -> None:

src/PIL/DdsImagePlugin.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,7 @@ def _open(self) -> None:
380380
elif pfflags & DDPF.PALETTEINDEXED8:
381381
self._mode = "P"
382382
self.palette = ImagePalette.raw("RGBA", self.fp.read(1024))
383+
self.palette.mode = "RGBA"
383384
elif pfflags & DDPF.FOURCC:
384385
offset = header_size + 4
385386
if fourcc == D3DFMT.DXT1:

src/PIL/GifImagePlugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ def load_prepare(self) -> None:
433433
self._prev_im = self.im
434434
if self._frame_palette:
435435
self.im = Image.core.fill("P", self.size, self._frame_transparency or 0)
436-
self.im.putpalette(*self._frame_palette.getdata())
436+
self.im.putpalette("RGB", *self._frame_palette.getdata())
437437
else:
438438
self.im = None
439439
self._mode = temp_mode

src/PIL/Image.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ def load(self):
889889
if self.im is not None and self.palette and self.palette.dirty:
890890
# realize palette
891891
mode, arr = self.palette.getdata()
892-
self.im.putpalette(mode, arr)
892+
self.im.putpalette(self.palette.mode, mode, arr)
893893
self.palette.dirty = 0
894894
self.palette.rawmode = None
895895
if "transparency" in self.info and mode in ("LA", "PA"):
@@ -899,9 +899,9 @@ def load(self):
899899
self.im.putpalettealphas(self.info["transparency"])
900900
self.palette.mode = "RGBA"
901901
else:
902-
palette_mode = "RGBA" if mode.startswith("RGBA") else "RGB"
903-
self.palette.mode = palette_mode
904-
self.palette.palette = self.im.getpalette(palette_mode, palette_mode)
902+
self.palette.palette = self.im.getpalette(
903+
self.palette.mode, self.palette.mode
904+
)
905905

906906
if self.im is not None:
907907
if cffi and USE_CFFI_ACCESS:
@@ -2046,7 +2046,7 @@ def putpalette(self, data, rawmode="RGB") -> None:
20462046
palette = ImagePalette.raw(rawmode, data)
20472047
self._mode = "PA" if "A" in self.mode else "P"
20482048
self.palette = palette
2049-
self.palette.mode = "RGB"
2049+
self.palette.mode = "RGBA" if "A" in rawmode else "RGB"
20502050
self.load() # install new palette
20512051

20522052
def putpixel(self, xy, value):
@@ -2161,7 +2161,7 @@ def remap_palette(self, dest_map, source_palette=None):
21612161
# m_im.putpalette(mapping_palette, 'L') # converts to 'P'
21622162
# or just force it.
21632163
# UNDONE -- this is part of the general issue with palettes
2164-
m_im.im.putpalette(palette_mode + ";L", m_im.palette.tobytes())
2164+
m_im.im.putpalette(palette_mode, palette_mode + ";L", m_im.palette.tobytes())
21652165

21662166
m_im = m_im.convert("L")
21672167

src/_imaging.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1725,10 +1725,11 @@ _putpalette(ImagingObject *self, PyObject *args) {
17251725
ImagingShuffler unpack;
17261726
int bits;
17271727

1728-
char *rawmode, *palette_mode;
1728+
char *palette_mode, *rawmode;
17291729
UINT8 *palette;
17301730
Py_ssize_t palettesize;
1731-
if (!PyArg_ParseTuple(args, "sy#", &rawmode, &palette, &palettesize)) {
1731+
if (!PyArg_ParseTuple(
1732+
args, "ssy#", &palette_mode, &rawmode, &palette, &palettesize)) {
17321733
return NULL;
17331734
}
17341735

@@ -1738,7 +1739,6 @@ _putpalette(ImagingObject *self, PyObject *args) {
17381739
return NULL;
17391740
}
17401741

1741-
palette_mode = strncmp("RGBA", rawmode, 4) == 0 ? "RGBA" : "RGB";
17421742
unpack = ImagingFindUnpacker(palette_mode, rawmode, &bits);
17431743
if (!unpack) {
17441744
PyErr_SetString(PyExc_ValueError, wrong_raw_mode);

0 commit comments

Comments
 (0)