Skip to content
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

Jump to bottom

Raise an error when allocating translucent color to RGB palette #6654

Merged
merged 4 commits into from Oct 10, 2022
Merged

Raise an error when allocating translucent color to RGB palette #6654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f9a3178
Fix #6652: Handle translucent color used in RGB ImagePallete
jsbueno Oct 9, 2022
982d7c4
Corrected test
radarhere Oct 10, 2022
0b2cef5
Updated error message
radarhere Oct 10, 2022
9133f35
Merge pull request #2 from radarhere/fix6652/imagepalette_rgba_color
jsbueno Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions Tests/test_image_access.py
View file
Open in desktop
Expand Up @@ -345,13 +345,14 @@ def test_reference_counting(self):

@pytest.mark.parametrize("mode", ("P", "PA"))
def test_p_putpixel_rgb_rgba(self, mode):
for color in [(255, 0, 0), (255, 0, 0, 127)]:
for color in ((255, 0, 0), (255, 0, 0, 127 if mode == "PA" else 255)):
im = Image.new(mode, (1, 1))
access = PyAccess.new(im, False)
access.putpixel((0, 0), color)

alpha = color[3] if len(color) == 4 and mode == "PA" else 255
assert im.convert("RGBA").getpixel((0, 0)) == (255, 0, 0, alpha)
if len(color) == 3:
color += (255,)
assert im.convert("RGBA").getpixel((0, 0)) == color


class TestImagePutPixelError(AccessTest):
Expand Down
10 changes: 10 additions & 0 deletions Tests/test_imagepalette.py
View file
Open in desktop
Expand Up @@ -50,6 +50,16 @@ def test_getcolor():
palette.getcolor("unknown")


def test_getcolor_rgba_color_rgb_palette():
palette = ImagePalette.ImagePalette("RGB")

# Opaque RGBA colors are converted
assert palette.getcolor((0, 0, 0, 255)) == palette.getcolor((0, 0, 0))

with pytest.raises(ValueError):
palette.getcolor((0, 0, 0, 128))


@pytest.mark.parametrize(
"index, palette",
[
Expand Down
6 changes: 5 additions & 1 deletion src/PIL/ImagePalette.py
View file
Open in desktop
Expand Up @@ -115,7 +115,11 @@ def getcolor(self, color, image=None):
raise ValueError("palette contains raw palette data")
if isinstance(color, tuple):
if self.mode == "RGB":
if len(color) == 4 and color[3] == 255:
if len(color) == 4:
if color[3] != 255:
raise ValueError(
"cannot add non-opaque RGBA color to RGB palette"
)
color = color[:3]
elif self.mode == "RGBA":
if len(color) == 3:
Expand Down