python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-15 10:42:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6292 from raygard/comment_use_gif89a

Browse Source 
Always use GIF89a for comments
This commit is contained in:
Andrew Murray 2022-05-21 10:24:14 +10:00 committed by GitHub
commit 2072a52bb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Tests/test_file_gif.py
View File

@ -807,6 +807,9 @@ def test_comment(tmp_path):
with Image.open(out) as reread: with Image.open(out) as reread:
assert reread.info["comment"] == im.info["comment"].encode() assert reread.info["comment"] == im.info["comment"].encode()
# Test that GIF89a is used for comments
assert reread.info["version"] == b"GIF89a"
def test_comment_over_255(tmp_path): def test_comment_over_255(tmp_path):
out = str(tmp_path / "temp.gif") out = str(tmp_path / "temp.gif")
@ -817,9 +820,11 @@ def test_comment_over_255(tmp_path):
im.info["comment"] = comment im.info["comment"] = comment
im.save(out) im.save(out)
with Image.open(out) as reread: with Image.open(out) as reread:
assert reread.info["comment"] == comment assert reread.info["comment"] == comment
# Test that GIF89a is used for comments
assert reread.info["version"] == b"GIF89a"
def test_zero_comment_subblocks(): def test_zero_comment_subblocks():
with Image.open("Tests/images/hopper_zero_comment_subblocks.gif") as im: with Image.open("Tests/images/hopper_zero_comment_subblocks.gif") as im:

21
src/PIL/GifImagePlugin.py
View File

@ -903,17 +903,16 @@ def _get_global_header(im, info):
# https://www.matthewflickinger.com/lab/whatsinagif/bits_and_bytes.asp # https://www.matthewflickinger.com/lab/whatsinagif/bits_and_bytes.asp
version = b"87a" version = b"87a"
for extensionKey in ["transparency", "duration", "loop", "comment"]: if im.info.get("version") == b"89a" or (
if info and extensionKey in info: info
if (extensionKey == "duration" and info[extensionKey] == 0) or ( and (
extensionKey == "comment" and not (1 <= len(info[extensionKey]) <= 255) "transparency" in info
): or "loop" in info
continue or info.get("duration")
version = b"89a" or info.get("comment")
break )
else: ):
if im.info.get("version") == b"89a": version = b"89a"
version = b"89a"
background = _get_background(im, info.get("background")) background = _get_background(im, info.get("background"))