python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-21 13:39:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2835 from radarhere/generator

Browse Source 
Added support for generators when using append_images for WEBP
This commit is contained in:
wiredfool 2017-11-13 13:20:08 +00:00 committed by GitHub
commit 669fd6a600
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PIL/TiffImagePlugin.py
View File

@ -1784,14 +1784,14 @@ class AppendingTiffWriter:
def _save_all(im, fp, filename): def _save_all(im, fp, filename):
encoderinfo = im.encoderinfo.copy() encoderinfo = im.encoderinfo.copy()
encoderconfig = im.encoderconfig encoderconfig = im.encoderconfig
append_images = encoderinfo.get("append_images", []) append_images = list(encoderinfo.get("append_images", []))
if not hasattr(im, "n_frames") and not append_images: if not hasattr(im, "n_frames") and not append_images:
return _save(im, fp, filename) return _save(im, fp, filename)
cur_idx = im.tell() cur_idx = im.tell()
try: try:
with AppendingTiffWriter(fp) as tf: with AppendingTiffWriter(fp) as tf:
for ims in itertools.chain([im], append_images): for ims in [im]+append_images:
ims.encoderinfo = encoderinfo ims.encoderinfo = encoderinfo
ims.encoderconfig = encoderconfig ims.encoderconfig = encoderconfig
if not hasattr(ims, "n_frames"): if not hasattr(ims, "n_frames"):

2
PIL/WebPImagePlugin.py
View File

@ -167,7 +167,7 @@ class WebPImageFile(ImageFile.ImageFile):
def _save_all(im, fp, filename): def _save_all(im, fp, filename):
encoderinfo = im.encoderinfo.copy() encoderinfo = im.encoderinfo.copy()
append_images = encoderinfo.get("append_images", []) append_images = list(encoderinfo.get("append_images", []))
# If total frame count is 1, then save using the legacy API, which # If total frame count is 1, then save using the legacy API, which
# will preserve non-alpha modes # will preserve non-alpha modes

40
Tests/test_file_webp_animated.py
View File

@ -65,25 +65,35 @@ class TestFileWebpAnimation(PillowTestCase):
are visually similar to the originals. are visually similar to the originals.
""" """
temp_file = self.tempfile("temp.webp") def check(temp_file):
temp_file2 = self.tempfile("temp.png") im = Image.open(temp_file)
self.assertEqual(im.n_frames, 2)
# Compare first frame to original
im.load()
self.assert_image_equal(im, frame1.convert("RGBA"))
# Compare second frame to original
im.seek(1)
im.load()
self.assert_image_equal(im, frame2.convert("RGBA"))
frame1 = Image.open('Tests/images/anim_frame1.webp') frame1 = Image.open('Tests/images/anim_frame1.webp')
frame2 = Image.open('Tests/images/anim_frame2.webp') frame2 = Image.open('Tests/images/anim_frame2.webp')
frame1.save(temp_file,
temp_file1 = self.tempfile("temp.webp")
frame1.copy().save(temp_file1,
save_all=True, append_images=[frame2], lossless=True) save_all=True, append_images=[frame2], lossless=True)
check(temp_file1)
im = Image.open(temp_file) # Tests appending using a generator
self.assertEqual(im.n_frames, 2) def imGenerator(ims):
for im in ims:
# Compare first frame to original yield im
im.load() temp_file2 = self.tempfile("temp_generator.webp")
im.save(temp_file2) frame1.copy().save(temp_file2,
self.assert_image_equal(im, frame1.convert("RGBA")) save_all=True, append_images=imGenerator([frame2]), lossless=True)
check(temp_file2)
# Compare second frame to original
im.seek(1)
im.load()
self.assert_image_equal(im, frame2.convert("RGBA"))
def test_timestamp_and_duration(self): def test_timestamp_and_duration(self):
""" """