python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-04-28 13:03:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6054 from radarhere/palette

Browse Source
This commit is contained in:
Hugo van Kemenade 2022-02-15 19:01:07 +02:00 committed by GitHub
commit f5a77fed39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Tests/test_image_putpalette.py
View File

@ -62,3 +62,16 @@ def test_putpalette_with_alpha_values():
im.putpalette(palette_with_alpha_values, "RGBA") im.putpalette(palette_with_alpha_values, "RGBA")
assert_image_equal(im.convert("RGBA"), expected) assert_image_equal(im.convert("RGBA"), expected)
@pytest.mark.parametrize(
"mode, palette",
(
("RGBA", (1, 2, 3, 4)),
("RGBAX", (1, 2, 3, 4, 0)),
),
)
def test_rgba_palette(mode, palette):
im = Image.new("P", (1, 1))
im.putpalette(palette, mode)
assert im.palette.colors == {(1, 2, 3, 4): 0}

17
src/PIL/Image.py
View File

@ -821,12 +821,6 @@ class Image:
if self.im and self.palette and self.palette.dirty: if self.im and self.palette and self.palette.dirty:
# realize palette # realize palette
mode, arr = self.palette.getdata() mode, arr = self.palette.getdata()
if mode == "RGBA":
mode = "RGB"
self.info["transparency"] = arr[3::4]
arr = bytes(
value for (index, value) in enumerate(arr) if index % 4 != 3
)
palette_length = self.im.putpalette(mode, arr) palette_length = self.im.putpalette(mode, arr)
self.palette.dirty = 0 self.palette.dirty = 0
self.palette.rawmode = None self.palette.rawmode = None
@ -837,8 +831,11 @@ class Image:
self.im.putpalettealphas(self.info["transparency"]) self.im.putpalettealphas(self.info["transparency"])
self.palette.mode = "RGBA" self.palette.mode = "RGBA"
else: else:
self.palette.mode = "RGB" palette_mode = "RGBA" if mode.startswith("RGBA") else "RGB"
self.palette.palette = self.im.getpalette()[: palette_length * 3] self.palette.mode = palette_mode
self.palette.palette = self.im.getpalette(palette_mode, palette_mode)[
: palette_length * len(palette_mode)
]
if self.im: if self.im:
if cffi and USE_CFFI_ACCESS: if cffi and USE_CFFI_ACCESS:
@ -1761,8 +1758,8 @@ class Image:
Alternatively, an 8-bit string may be used instead of an integer sequence. Alternatively, an 8-bit string may be used instead of an integer sequence.
:param data: A palette sequence (either a list or a string). :param data: A palette sequence (either a list or a string).
:param rawmode: The raw mode of the palette. Either "RGB", "RGBA", or a :param rawmode: The raw mode of the palette. Either "RGB", "RGBA", or a mode
mode that can be transformed to "RGB" (e.g. "R", "BGR;15", "RGBA;L"). that can be transformed to "RGB" or "RGBA" (e.g. "R", "BGR;15", "RGBA;L").
""" """
from . import ImagePalette from . import ImagePalette

7
src/_imaging.c
View File

@ -1641,7 +1641,7 @@ _putpalette(ImagingObject *self, PyObject *args) {
ImagingShuffler unpack; ImagingShuffler unpack;
int bits; int bits;
char *rawmode; char *rawmode, *palette_mode;
UINT8 *palette; UINT8 *palette;
Py_ssize_t palettesize; Py_ssize_t palettesize;
if (!PyArg_ParseTuple(args, "sy#", &rawmode, &palette, &palettesize)) { if (!PyArg_ParseTuple(args, "sy#", &rawmode, &palette, &palettesize)) {
@ -1654,7 +1654,8 @@ _putpalette(ImagingObject *self, PyObject *args) {
return NULL; return NULL;
} }
unpack = ImagingFindUnpacker("RGB", rawmode, &bits); palette_mode = strncmp("RGBA", rawmode, 4) == 0 ? "RGBA" : "RGB";
unpack = ImagingFindUnpacker(palette_mode, rawmode, &bits);
if (!unpack) { if (!unpack) {
PyErr_SetString(PyExc_ValueError, wrong_raw_mode); PyErr_SetString(PyExc_ValueError, wrong_raw_mode);
return NULL; return NULL;
@ -1669,7 +1670,7 @@ _putpalette(ImagingObject *self, PyObject *args) {
strcpy(self->image->mode, strlen(self->image->mode) == 2 ? "PA" : "P"); strcpy(self->image->mode, strlen(self->image->mode) == 2 ? "PA" : "P");
self->image->palette = ImagingPaletteNew("RGB"); self->image->palette = ImagingPaletteNew(palette_mode);
unpack(self->image->palette->palette, palette, palettesize * 8 / bits); unpack(self->image->palette->palette, palette, palettesize * 8 / bits);