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

Allow arbitrary number of comment extension subblocks

Browse Source
This commit is contained in:
Andrew Murray 2018-11-27 21:05:41 +11:00
parent f1b2802eb1
commit b2b737b68b
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Tests/test_file_gif.py
View File

@ -435,6 +435,18 @@ class TestFileGif(PillowTestCase):
self.assertEqual(reread.info['comment'], im.info['comment'])
def test_comment_over_255(self):
out = self.tempfile('temp.gif')
im = Image.new('L', (100, 100), '#000')
comment = b"Test comment text"
while len(comment) < 256:
comment += comment
im.info['comment'] = comment
im.save(out)
reread = Image.open(out)
self.assertEqual(reread.info['comment'], comment)
def test_zero_comment_subblocks(self):
im = Image.open('Tests/images/hopper_zero_comment_subblocks.gif')
expected = Image.open(TEST_GIF)

22
src/PIL/GifImagePlugin.py
View File

@ -201,9 +201,13 @@ class GifImageFile(ImageFile.ImageFile):
#
# comment extension
#
info["comment"] = block
if not block:
continue
while block:
if "comment" in info:
info["comment"] += block
else:
info["comment"] = block
block = self.data()
continue
elif i8(s) == 255:
#
# application extension
@ -538,12 +542,14 @@ def _write_local_header(fp, im, offset, flags):
o8(0))
if "comment" in im.encoderinfo and \
1 <= len(im.encoderinfo["comment"]) <= 255:
1 <= len(im.encoderinfo["comment"]):
fp.write(b"!" +
o8(254) + # extension intro
o8(len(im.encoderinfo["comment"])) +
im.encoderinfo["comment"] +
o8(0))
o8(254)) # extension intro
for i in range(0, len(im.encoderinfo["comment"]), 255):
subblock = im.encoderinfo["comment"][i:i+255]
fp.write(o8(len(subblock)) +
subblock)
fp.write(o8(0))
if "loop" in im.encoderinfo:
number_of_loops = im.encoderinfo["loop"]
fp.write(b"!" +