python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-05-02 23:13:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Only read the number of loops from the first frame

Browse Source
This commit is contained in:
Andrew Murray 2022-04-15 16:44:23 +10:00
parent 5cf02f816f
commit 2457eafabd
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tests/images/duplicate_number_of_loops.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

9
Tests/test_file_gif.py
View File

@ -772,9 +772,16 @@ def test_number_of_loops(tmp_path):
im = Image.new("L", (100, 100), "#000") im = Image.new("L", (100, 100), "#000")
im.save(out, loop=number_of_loops) im.save(out, loop=number_of_loops)
with Image.open(out) as reread: with Image.open(out) as reread:
assert reread.info["loop"] == number_of_loops assert reread.info["loop"] == number_of_loops
# Check that even if a subsequent GIF frame has the number of loops specified,
# only the value from the first frame is used
with Image.open("Tests/images/duplicate_number_of_loops.gif") as im:
assert im.info["loop"] == 2
im.seek(1)
assert im.info["loop"] == 2
def test_background(tmp_path): def test_background(tmp_path):
out = str(tmp_path / "temp.gif") out = str(tmp_path / "temp.gif")

6
src/PIL/GifImagePlugin.py
View File

@ -244,7 +244,7 @@ class GifImageFile(ImageFile.ImageFile):
info["comment"] = comment info["comment"] = comment
s = None s = None
continue continue
elif s[0] == 255: elif s[0] == 255 and frame == 0:
# #
# application extension # application extension
# #
@ -252,7 +252,7 @@ class GifImageFile(ImageFile.ImageFile):
if block[:11] == b"NETSCAPE2.0": if block[:11] == b"NETSCAPE2.0":
block = self.data() block = self.data()
if len(block) >= 3 and block[0] == 1: if len(block) >= 3 and block[0] == 1:
info["loop"] = i16(block, 1) self.info["loop"] = i16(block, 1)
while self.data(): while self.data():
pass pass
@ -399,7 +399,7 @@ class GifImageFile(ImageFile.ImageFile):
if info.get("comment"): if info.get("comment"):
self.info["comment"] = info["comment"] self.info["comment"] = info["comment"]
for k in ["duration", "extension", "loop"]: for k in ["duration", "extension"]:
if k in info: if k in info:
self.info[k] = info[k] self.info[k] = info[k]
elif k in self.info: elif k in self.info: