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

Use n_frames and _seek_check

Browse Source
This commit is contained in:
Andrew Murray 2025-05-10 20:56:56 +10:00
parent f5d9838e30
commit ccfc2524b8
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tests/test_file_ani.py
View File

@ -10,7 +10,7 @@ from PIL import Image
def test_aero_busy() -> None: def test_aero_busy() -> None:
with Image.open("Tests/images/ani/aero_busy.ani") as im: with Image.open("Tests/images/ani/aero_busy.ani") as im:
assert im.size == (64, 64) assert im.size == (64, 64)
assert im.info["frames"] == 18 assert im.n_frames == 18
with Image.open("Tests/images/ani/aero_busy_0.png") as png: with Image.open("Tests/images/ani/aero_busy_0.png") as png:
assert png.tobytes() == im.tobytes() assert png.tobytes() == im.tobytes()
@ -29,7 +29,7 @@ def test_aero_busy() -> None:
def test_posy_busy() -> None: def test_posy_busy() -> None:
with Image.open("Tests/images/ani/posy_busy.ani") as im: with Image.open("Tests/images/ani/posy_busy.ani") as im:
assert im.size == (96, 96) assert im.size == (96, 96)
assert im.info["frames"] == 77 assert im.n_frames == 77
with Image.open("Tests/images/ani/posy_busy_0.png") as png: with Image.open("Tests/images/ani/posy_busy_0.png") as png:
assert png.tobytes() == im.tobytes() assert png.tobytes() == im.tobytes()
@ -45,7 +45,7 @@ def test_posy_busy() -> None:
def test_stopwtch() -> None: def test_stopwtch() -> None:
with Image.open("Tests/images/ani/stopwtch.ani") as im: with Image.open("Tests/images/ani/stopwtch.ani") as im:
assert im.size == (32, 32) assert im.size == (32, 32)
assert im.info["frames"] == 8 assert im.n_frames == 8
assert im.info["seq"][0] == 0 assert im.info["seq"][0] == 0
assert im.info["seq"][2] == 0 assert im.info["seq"][2] == 0
@ -132,7 +132,7 @@ def test_save() -> None:
) )
with Image.open(output, formats=["ANI"]) as im: with Image.open(output, formats=["ANI"]) as im:
assert im.info["frames"] == 6 assert im.n_frames == 6
assert im.info["seq"] == [0, 2, 4, 1, 3, 5, 0, 1, 0, 1] assert im.info["seq"] == [0, 2, 4, 1, 3, 5, 0, 1, 0, 1]
assert im.info["rate"] == [1, 2, 3, 1, 2, 3, 1, 2, 3, 4] assert im.info["rate"] == [1, 2, 3, 1, 2, 3, 1, 2, 3, 4]
assert im.size == (32, 32) assert im.size == (32, 32)

7
src/PIL/AniImagePlugin.py
View File

@ -407,7 +407,7 @@ class AniImageFile(ImageFile.ImageFile):
self.info["rate"] = self.ani.rate self.info["rate"] = self.ani.rate
assert self.ani.anih is not None assert self.ani.anih is not None
self.info["frames"] = self.ani.anih["nFrames"] self.n_frames = self.ani.anih["nFrames"]
self.frame = 0 self.frame = 0
self.seek(0) self.seek(0)
@ -434,9 +434,8 @@ class AniImageFile(ImageFile.ImageFile):
return Image.Image.load(self) return Image.Image.load(self)
def seek(self, frame: int) -> None: def seek(self, frame: int) -> None:
if frame > self.info["frames"] - 1 or frame < 0: if not self._seek_check(frame):
msg = "Frame index out of animation bounds" return
raise EOFError(msg)
self.frame = frame self.frame = frame