Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Always use GIF89a for comments #6292

Merged
merged 4 commits into from May 21, 2022
Merged

Always use GIF89a for comments #6292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3d29e9
Always use GIF89a for long comments
raygard May 13, 2022
9832935
Simplified version check
radarhere May 19, 2022
138bd28
Added check to test_comment as well
radarhere May 19, 2022
882c04b
Merge pull request #1 from radarhere/comment_use_gif89a
raygard May 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion Tests/test_file_gif.py
View file
Open in desktop
Expand Up @@ -794,6 +794,9 @@ def test_comment(tmp_path):
with Image.open(out) as reread:
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):
out = str(tmp_path / "temp.gif")
Expand All @@ -804,9 +807,11 @@ def test_comment_over_255(tmp_path):
im.info["comment"] = comment
im.save(out)
with Image.open(out) as reread:

assert reread.info["comment"] == comment

# Test that GIF89a is used for comments
assert reread.info["version"] == b"GIF89a"


def test_zero_comment_subblocks():
with Image.open("Tests/images/hopper_zero_comment_subblocks.gif") as im:
Expand Down
21 changes: 10 additions & 11 deletions src/PIL/GifImagePlugin.py
View file
Open in desktop
Expand Up @@ -912,17 +912,16 @@ def _get_global_header(im, info):
# https://www.matthewflickinger.com/lab/whatsinagif/bits_and_bytes.asp

version = b"87a"
for extensionKey in ["transparency", "duration", "loop", "comment"]:
if info and extensionKey in info:
if (extensionKey == "duration" and info[extensionKey] == 0) or (
extensionKey == "comment" and not (1 <= len(info[extensionKey]) <= 255)
):
continue
version = b"89a"
break
else:
if im.info.get("version") == b"89a":
version = b"89a"
if im.info.get("version") == b"89a" or (
info
and (
"transparency" in info
or "loop" in info
or info.get("duration")
or info.get("comment")
)
):
version = b"89a"

background = _get_background(im, info.get("background"))

Expand Down