Skip to content

Simplify palette code #10003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
radarhere merged 1 commit into from
Sep 17, 2026
+4 −12
Merged

Simplify palette code #10003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tests/test_image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ def test_remap_palette(self) -> None:
assert_image_equal(im_p, im_remapped)
assert im_p.palette is not None
assert im_remapped.palette is not None
assert im_p.palette.palette == im_remapped.palette.palette
assert bytes(im_p.palette.palette) == im_remapped.palette.palette

# Test illegal image mode
with hopper() as im_hopper:
Expand Down
5 changes: 1 addition & 4 deletions src/PIL/FliImagePlugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
from . import Image, ImageFile, ImagePalette
from ._binary import i16le as i16
from ._binary import i32le as i32
from ._binary import o8
from ._util import DeferredError

#
Expand Down Expand Up @@ -104,9 +103,7 @@ def _open(self) -> None:
if not chunk_size:
break

self.palette = ImagePalette.raw(
"RGB", b"".join(o8(r) + o8(g) + o8(b) for (r, g, b) in palette)
)
self.palette = ImagePalette.raw("RGB", tuple(v for rgb in palette for v in rgb))

# set things up to decode first frame
self.__frame = -1
Expand Down
4 changes: 0 additions & 4 deletions src/PIL/Image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2167,17 +2167,13 @@ def putpalette(
palette = ImagePalette.ImagePalette(palette=data.palette)
palette.dirty = 1
else:
if not isinstance(data, bytes):
data = bytes(data)
palette = ImagePalette.raw(rawmode, data)
self._mode = "PA" if "A" in self.mode else "P"
self.palette = palette
if rawmode.startswith("CMYK"):
self.palette.mode = "CMYK"
elif "A" in rawmode:
self.palette.mode = "RGBA"
else:
self.palette.mode = "RGB"
self.load() # install new palette

def putpixel(
Expand Down
5 changes: 2 additions & 3 deletions src/PIL/TiffImagePlugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
from . import ExifTags, Image, ImageFile, ImageOps, ImagePalette, TiffTags
from ._binary import i16be as i16
from ._binary import i32be as i32
from ._binary import o8
from ._util import DeferredError, is_path
from .TiffTags import TYPES

Expand Down Expand Up @@ -1679,8 +1678,8 @@ def _setup(self) -> None:
# fixup palette descriptor

if self.mode in ["P", "PA"]:
palette = [o8(b // 256) for b in self.tag_v2[COLORMAP]]
self.palette = ImagePalette.raw("RGB;L", b"".join(palette))
palette = tuple(b // 256 for b in self.tag_v2[COLORMAP])
self.palette = ImagePalette.raw("RGB;L", palette)
else:
self.palette = None

Expand Down