python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-03 21:24:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow remapping P images with RGBA palettes

Browse Source
This commit is contained in:
Andrew Murray 2022-06-06 00:12:48 +10:00
parent b37f2d1063
commit 4c8aff9798
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tests/test_image.py
View File

@ -604,6 +604,15 @@ class TestImage:
with Image.open("Tests/images/hopper.gif") as im: with Image.open("Tests/images/hopper.gif") as im:
assert_image_equal(im, im.remap_palette(list(range(256)))) assert_image_equal(im, im.remap_palette(list(range(256))))
# Test identity transform with an RGBA palette
im = Image.new("P", (256, 1))
for x in range(256):
im.putpixel((x, 0), x)
im.putpalette(list(range(256)) * 4, "RGBA")
im_remapped = im.remap_palette(list(range(256)))
assert_image_equal(im, im_remapped)
assert im.palette.palette == im_remapped.palette.palette
# Test illegal image mode # Test illegal image mode
with hopper() as im: with hopper() as im:
with pytest.raises(ValueError): with pytest.raises(ValueError):

27
src/PIL/Image.py
View File

@ -1867,10 +1867,15 @@ class Image:
if self.mode not in ("L", "P"): if self.mode not in ("L", "P"):
raise ValueError("illegal image mode") raise ValueError("illegal image mode")
bands = 3
palette_mode = "RGB"
if source_palette is None: if source_palette is None:
if self.mode == "P": if self.mode == "P":
self.load() self.load()
source_palette = self.im.getpalette("RGB")[:768] palette_mode = self.im.getpalettemode()
if palette_mode == "RGBA":
bands = 4
source_palette = self.im.getpalette(palette_mode, palette_mode)
else: # L-mode else: # L-mode
source_palette = bytearray(i // 3 for i in range(768)) source_palette = bytearray(i // 3 for i in range(768))
@ -1879,7 +1884,9 @@ class Image:
# pick only the used colors from the palette # pick only the used colors from the palette
for i, oldPosition in enumerate(dest_map): for i, oldPosition in enumerate(dest_map):
palette_bytes += source_palette[oldPosition * 3 : oldPosition * 3 + 3] palette_bytes += source_palette[
oldPosition * bands : oldPosition * bands + bands
]
new_positions[oldPosition] = i new_positions[oldPosition] = i
# replace the palette color id of all pixel with the new id # replace the palette color id of all pixel with the new id
@ -1905,19 +1912,23 @@ class Image:
m_im = self.copy() m_im = self.copy()
m_im.mode = "P" m_im.mode = "P"
m_im.palette = ImagePalette.ImagePalette("RGB", palette=mapping_palette * 3) m_im.palette = ImagePalette.ImagePalette(
palette_mode, palette=mapping_palette * bands
)
# possibly set palette dirty, then # possibly set palette dirty, then
# m_im.putpalette(mapping_palette, 'L') # converts to 'P' # m_im.putpalette(mapping_palette, 'L') # converts to 'P'
# or just force it. # or just force it.
# UNDONE -- this is part of the general issue with palettes # UNDONE -- this is part of the general issue with palettes
m_im.im.putpalette("RGB;L", m_im.palette.tobytes()) m_im.im.putpalette(palette_mode + ";L", m_im.palette.tobytes())
m_im = m_im.convert("L") m_im = m_im.convert("L")
# Internally, we require 768 bytes for a palette. # Internally, we require 256 palette entries.
new_palette_bytes = palette_bytes + (768 - len(palette_bytes)) * b"\x00" new_palette_bytes = (
m_im.putpalette(new_palette_bytes) palette_bytes + ((256 * bands) - len(palette_bytes)) * b"\x00"
m_im.palette = ImagePalette.ImagePalette("RGB", palette=palette_bytes) )
m_im.putpalette(new_palette_bytes, palette_mode)
m_im.palette = ImagePalette.ImagePalette(palette_mode, palette=palette_bytes)
if "transparency" in self.info: if "transparency" in self.info:
try: try: