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

Merge pull request #8169 from radarhere/cast

Browse Source
This commit is contained in:
Hugo van Kemenade 2024-06-28 00:14:21 -06:00 committed by GitHub
commit 02133dc9ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/PIL/Image.py
View File

@ -1113,7 +1113,7 @@ class Image:
if trns is not None: if trns is not None:
try: try:
new_im.info["transparency"] = new_im.palette.getcolor( new_im.info["transparency"] = new_im.palette.getcolor(
cast(Tuple[int, int, int], trns), # trns was converted to RGB cast(Tuple[int, ...], trns), # trns was converted to RGB
new_im, new_im,
) )
except Exception: except Exception:
@ -1163,12 +1163,9 @@ class Image:
# crash fail if we leave a bytes transparency in an rgb/l mode. # crash fail if we leave a bytes transparency in an rgb/l mode.
del new_im.info["transparency"] del new_im.info["transparency"]
if trns is not None: if trns is not None:
if new_im.mode == "P": if new_im.mode == "P" and new_im.palette:
try: try:
new_im.info["transparency"] = new_im.palette.getcolor( new_im.info["transparency"] = new_im.palette.getcolor(trns, new_im)
cast(Tuple[int, int, int], trns), # trns was converted to RGB
new_im,
)
except ValueError as e: except ValueError as e:
del new_im.info["transparency"] del new_im.info["transparency"]
if str(e) != "cannot allocate more than 256 colors": if str(e) != "cannot allocate more than 256 colors":