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

Consider transparency when applying blend mask

Browse Source
This commit is contained in:
Andrew Murray 2023-03-16 20:05:56 +11:00
parent 2d5f451f58
commit 0966293a0d
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tests/images/blend_transparency.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 211 B

6
Tests/test_file_apng.py
View File

@ -163,6 +163,12 @@ def test_apng_blend():
assert im.getpixel((64, 32)) == (0, 255, 0, 255) assert im.getpixel((64, 32)) == (0, 255, 0, 255)
def test_apng_blend_transparency():
with Image.open("Tests/images/blend_transparency.png") as im:
im.seek(1)
assert im.getpixel((0, 0)) == (255, 0, 0)
def test_apng_chunk_order(): def test_apng_chunk_order():
with Image.open("Tests/images/apng/fctl_actl.png") as im: with Image.open("Tests/images/apng/fctl_actl.png") as im:
im.seek(im.n_frames - 1) im.seek(im.n_frames - 1)

10
src/PIL/PngImagePlugin.py
View File

@ -1003,9 +1003,13 @@ class PngImageFile(ImageFile.ImageFile):
else: else:
if self._prev_im and self.blend_op == Blend.OP_OVER: if self._prev_im and self.blend_op == Blend.OP_OVER:
updated = self._crop(self.im, self.dispose_extent) updated = self._crop(self.im, self.dispose_extent)
self._prev_im.paste( if self.im.mode == "RGB" and "transparency" in self.info:
updated, self.dispose_extent, updated.convert("RGBA") mask = updated.convert_transparent(
) "RGBA", self.info["transparency"]
)
else:
mask = updated.convert("RGBA")
self._prev_im.paste(updated, self.dispose_extent, mask)
self.im = self._prev_im self.im = self._prev_im
if self.pyaccess: if self.pyaccess:
self.pyaccess = None self.pyaccess = None