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

Merge pull request #5549 from radarhere/palette

Browse Source
This commit is contained in:
Hugo van Kemenade 2021-06-20 15:44:38 +03:00 committed by GitHub
commit 53b51e1df6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Tests/test_file_tga.py
View File

@ -65,10 +65,15 @@ def test_sanity(tmp_path):
roundtrip(original_im) roundtrip(original_im)
def test_palette_depth_16(): def test_palette_depth_16(tmp_path):
with Image.open("Tests/images/p_16.tga") as im: with Image.open("Tests/images/p_16.tga") as im:
assert_image_equal_tofile(im.convert("RGB"), "Tests/images/p_16.png") assert_image_equal_tofile(im.convert("RGB"), "Tests/images/p_16.png")
out = str(tmp_path / "temp.png")
im.save(out)
with Image.open(out) as reloaded:
assert_image_equal_tofile(reloaded.convert("RGB"), "Tests/images/p_16.png")
def test_id_field(): def test_id_field():
# tga file with id field # tga file with id field

3
src/PIL/Image.py
View File

@ -830,7 +830,7 @@ class Image:
arr = bytes( arr = bytes(
value for (index, value) in enumerate(arr) if index % 4 != 3 value for (index, value) in enumerate(arr) if index % 4 != 3
) )
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
if "transparency" in self.info: if "transparency" in self.info:
@ -841,6 +841,7 @@ class Image:
self.palette.mode = "RGBA" self.palette.mode = "RGBA"
else: else:
self.palette.mode = "RGB" self.palette.mode = "RGB"
self.palette.palette = self.im.getpalette()[: palette_length * 3]
if self.im: if self.im:
if cffi and USE_CFFI_ACCESS: if cffi and USE_CFFI_ACCESS:

3
src/_imaging.c
View File

@ -1663,8 +1663,7 @@ _putpalette(ImagingObject *self, PyObject *args) {
unpack(self->image->palette->palette, palette, palettesize * 8 / bits); unpack(self->image->palette->palette, palette, palettesize * 8 / bits);
Py_INCREF(Py_None); return PyLong_FromLong(palettesize * 8 / bits);
return Py_None;
} }
static PyObject * static PyObject *