python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-26 01:46:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6654 from jsbueno/fix6652/imagepalette_rgba_color

Browse Source 
Raise an error when allocating translucent color to RGB palette
This commit is contained in:
Andrew Murray 2022-10-10 19:23:18 +11:00 committed by GitHub
commit 10edb29674
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Tests/test_image_access.py
View File

@ -345,13 +345,14 @@ class TestCffi(AccessTest):
@pytest.mark.parametrize("mode", ("P", "PA")) @pytest.mark.parametrize("mode", ("P", "PA"))
def test_p_putpixel_rgb_rgba(self, mode): 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)) im = Image.new(mode, (1, 1))
access = PyAccess.new(im, False) access = PyAccess.new(im, False)
access.putpixel((0, 0), color) access.putpixel((0, 0), color)
alpha = color[3] if len(color) == 4 and mode == "PA" else 255 if len(color) == 3:
assert im.convert("RGBA").getpixel((0, 0)) == (255, 0, 0, alpha) color += (255,)
assert im.convert("RGBA").getpixel((0, 0)) == color
class TestImagePutPixelError(AccessTest): class TestImagePutPixelError(AccessTest):

10
Tests/test_imagepalette.py
View File

@ -50,6 +50,16 @@ def test_getcolor():
palette.getcolor("unknown") 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( @pytest.mark.parametrize(
"index, palette", "index, palette",
[ [

6
src/PIL/ImagePalette.py
View File

@ -115,7 +115,11 @@ class ImagePalette:
raise ValueError("palette contains raw palette data") raise ValueError("palette contains raw palette data")
if isinstance(color, tuple): if isinstance(color, tuple):
if self.mode == "RGB": 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] color = color[:3]
elif self.mode == "RGBA": elif self.mode == "RGBA":
if len(color) == 3: if len(color) == 3: