python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-11-13 05:06:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

If n_frames is known, then use when determining is_animated

Browse Source
This commit is contained in:
Andrew Murray 2017-08-18 20:20:27 +10:00
parent 8e8643d1ac
commit ce999ff302
4 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
PIL/GifImagePlugin.py
View File

@ -102,15 +102,18 @@ class GifImageFile(ImageFile.ImageFile):
@property @property
def is_animated(self): def is_animated(self):
if self._is_animated is None: if self._is_animated is None:
current = self.tell() if self._n_frames is not None:
self._is_animated = self._n_frames != 1
else:
current = self.tell()
try: try:
self.seek(1) self.seek(1)
self._is_animated = True self._is_animated = True
except EOFError: except EOFError:
self._is_animated = False self._is_animated = False
self.seek(current) self.seek(current)
return self._is_animated return self._is_animated
def seek(self, frame): def seek(self, frame):

17
PIL/TiffImagePlugin.py
View File

@ -931,15 +931,18 @@ class TiffImageFile(ImageFile.ImageFile):
@property @property
def is_animated(self): def is_animated(self):
if self._is_animated is None: if self._is_animated is None:
current = self.tell() if self._n_frames is not None:
self._is_animated = self._n_frames != 1
else:
current = self.tell()
try: try:
self.seek(1) self.seek(1)
self._is_animated = True self._is_animated = True
except EOFError: except EOFError:
self._is_animated = False self._is_animated = False
self.seek(current) self.seek(current)
return self._is_animated return self._is_animated
def seek(self, frame): def seek(self, frame):

17
Tests/test_file_gif.py
View File

@ -208,13 +208,18 @@ class TestFileGif(PillowTestCase):
self.assertEqual(framecount, 5) self.assertEqual(framecount, 5)
def test_n_frames(self): def test_n_frames(self):
im = Image.open(TEST_GIF) for path, n_frames in [
self.assertEqual(im.n_frames, 1) [TEST_GIF, 1],
self.assertFalse(im.is_animated) ['Tests/images/iss634.gif', 42]
]:
# Test is_animated before n_frames
im = Image.open(path)
self.assertEqual(im.is_animated, n_frames != 1)
im = Image.open("Tests/images/iss634.gif") # Test is_animated after n_frames
self.assertEqual(im.n_frames, 42) im = Image.open(path)
self.assertTrue(im.is_animated) self.assertEqual(im.n_frames, n_frames)
self.assertEqual(im.is_animated, n_frames != 1)
def test_eoferror(self): def test_eoferror(self):
im = Image.open(TEST_GIF) im = Image.open(TEST_GIF)

17
Tests/test_file_tiff.py
View File

@ -216,13 +216,18 @@ class TestFileTiff(PillowTestCase):
im.getextrema(), (-3.140936851501465, 3.140684127807617)) im.getextrema(), (-3.140936851501465, 3.140684127807617))
def test_n_frames(self): def test_n_frames(self):
im = Image.open('Tests/images/multipage-lastframe.tif') for path, n_frames in [
self.assertEqual(im.n_frames, 1) ['Tests/images/multipage-lastframe.tif', 1],
self.assertFalse(im.is_animated) ['Tests/images/multipage.tiff', 3]
]:
# Test is_animated before n_frames
im = Image.open(path)
self.assertEqual(im.is_animated, n_frames != 1)
im = Image.open('Tests/images/multipage.tiff') # Test is_animated after n_frames
self.assertEqual(im.n_frames, 3) im = Image.open(path)
self.assertTrue(im.is_animated) self.assertEqual(im.n_frames, n_frames)
self.assertEqual(im.is_animated, n_frames != 1)
def test_eoferror(self): def test_eoferror(self):
im = Image.open('Tests/images/multipage-lastframe.tif') im = Image.open('Tests/images/multipage-lastframe.tif')