Skip to content

Ignore putpalette rawmode if data is an ImagePalette #10032

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

Open
radarhere wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Ignore putpalette rawmode if data is an ImagePalette #10032

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
5 changes: 5 additions & 0 deletions Tests/test_image_putpalette.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ def test_imagepalette() -> None:
im.putpalette(ImagePalette.wedge())
assert_image_equal_tofile(im.convert("RGB"), "Tests/images/palette_wedge.png")

# Check that rawmode is ignored
im.putpalette(ImagePalette.wedge(), "RGBA")
assert im.palette is not None
assert im.palette.mode == "RGB"


def test_putpalette_with_alpha_values() -> None:
with Image.open("Tests/images/transparent.gif") as im:
Expand Down
2 changes: 1 addition & 1 deletion src/PIL/GifImagePlugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ def _write_multiple_frames(
background_im = Image.new("P", im_frame.size, background)
first_palette = im_frames[0].im.palette
assert first_palette is not None
background_im.putpalette(first_palette, first_palette.mode)
background_im.putpalette(first_palette)
bbox = _getbbox(background_im, im_frame)[1]
else:
bbox = (0, 0, *im_frame.size)
Expand Down
16 changes: 9 additions & 7 deletions src/PIL/Image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1145,7 +1145,7 @@ def convert_transparency(
trns_im = new(self.mode, (1, 1))
if self.mode == "P":
assert self.palette is not None
trns_im.putpalette(self.palette, self.palette.mode)
trns_im.putpalette(self.palette)
if isinstance(t, tuple):
err = "Couldn't allocate a palette color for transparency"
assert trns_im.palette is not None
Expand Down Expand Up @@ -2151,25 +2151,27 @@ def putpalette(

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) or an ImagePalette.
:param rawmode: The raw mode of the palette. Either "RGB", "RGBA", "CMYK", or a
mode that can be transformed to one of those modes (e.g. "R", "RGBA;L").
Ignored if ``data`` is an ImagePalette.
"""
from . import ImagePalette

if self.mode not in ("L", "LA", "P", "PA"):
msg = "illegal image mode"
raise ValueError(msg)
if isinstance(data, ImagePalette.ImagePalette):
palette = ImagePalette.raw(data.rawmode or "RGB", data.palette)
palette = data.copy()
palette.dirty = 1
else:
palette = ImagePalette.raw(rawmode, data)
if rawmode.startswith("CMYK"):
palette.mode = "CMYK"
elif "A" in rawmode:
palette.mode = "RGBA"
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"
self.load() # install new palette

def putpixel(
Expand Down
Loading