Added is_animated

PIL/DcxImagePlugin.py

@@ -66,6 +66,10 @@ class DcxImageFile(PcxImageFile):
     def n_frames(self):
         return len(self._offset)
 
+    @property
+    def is_animated(self):
+        return len(self._offset) > 1
+
     def seek(self, frame):
         if frame >= len(self._offset):
             raise EOFError("attempt to seek outside DCX directory")

PIL/FliImagePlugin.py

@@ -90,6 +90,7 @@ class FliImageFile(ImageFile.ImageFile):
         self.__fp = self.fp
         self.__rewind = self.fp.tell()
         self._n_frames = None
+        self._is_animated = None
         self.seek(0)
 
     def _palette(self, palette, shift):
@@ -122,6 +123,20 @@ class FliImageFile(ImageFile.ImageFile):
             self.seek(current)
         return self._n_frames
 
+    @property
+    def is_animated(self):
+        if self._is_animated is None:
+            current = self.tell()
+
+            try:
+                self.seek(1)
+                self._is_animated = True
+            except EOFError:
+                self._is_animated = False
+
+            self.seek(current)
+        return self._is_animated
+
     def seek(self, frame):
         if frame == self.__frame:
             return

PIL/GifImagePlugin.py

@@ -88,6 +88,7 @@ class GifImageFile(ImageFile.ImageFile):
         self.__fp = self.fp  # FIXME: hack
         self.__rewind = self.fp.tell()
         self._n_frames = None
+        self._is_animated = None
         self._seek(0)  # get ready to read first frame
 
     @property
@@ -102,6 +103,20 @@ class GifImageFile(ImageFile.ImageFile):
             self.seek(current)
         return self._n_frames
 
+    @property
+    def is_animated(self):
+        if self._is_animated is None:
+            current = self.tell()
+
+            try:
+                self.seek(1)
+                self._is_animated = True
+            except EOFError:
+                self._is_animated = False
+
+            self.seek(current)
+        return self._is_animated
+
     def seek(self, frame):
         if frame == self.__frame:
             return

PIL/ImImagePlugin.py

@@ -264,6 +264,10 @@ class ImImageFile(ImageFile.ImageFile):
     def n_frames(self):
         return self.info[FRAMES]
 
+    @property
+    def is_animated(self):
+        return self.info[FRAMES] > 1
+
     def seek(self, frame):
 
         if frame < 0 or frame >= self.info[FRAMES]:

PIL/MicImagePlugin.py

@@ -75,6 +75,10 @@ class MicImageFile(TiffImagePlugin.TiffImageFile):
     def n_frames(self):
         return len(self.images)
 
+    @property
+    def is_animated(self):
+        return len(self.images) > 1
+
     def seek(self, frame):
 
         try:

PIL/MpoImagePlugin.py

@@ -66,6 +66,10 @@ class MpoImageFile(JpegImagePlugin.JpegImageFile):
     def n_frames(self):
         return self.__framecount
 
+    @property
+    def is_animated(self):
+        return self.__framecount > 1
+
     def seek(self, frame):
         if frame < 0 or frame >= self.__framecount:
             raise EOFError("no more images in MPO file")

PIL/PsdImagePlugin.py

@@ -136,6 +136,10 @@ class PsdImageFile(ImageFile.ImageFile):
     def n_frames(self):
         return len(self.layers)
 
+    @property
+    def is_animated(self):
+        return len(self.layers) > 1
+
     def seek(self, layer):
         # seek to given layer (1..max)
         if layer == self.frame:

PIL/SpiderImagePlugin.py

@@ -158,6 +158,10 @@ class SpiderImageFile(ImageFile.ImageFile):
     def n_frames(self):
         return self._nimages
 
+    @property
+    def is_animated(self):
+        return self._nimages > 1
+
     # 1st image index is zero (although SPIDER imgnumber starts at 1)
     def tell(self):
         if self.imgnumber < 1:

PIL/TiffImagePlugin.py

@@ -650,6 +650,7 @@ class TiffImageFile(ImageFile.ImageFile):
         self.__fp = self.fp
         self._frame_pos = []
         self._n_frames = None
+        self._is_animated = None
 
         if Image.DEBUG:
             print("*** TiffImageFile._open ***")
@@ -671,6 +672,20 @@ class TiffImageFile(ImageFile.ImageFile):
             self.seek(current)
         return self._n_frames
 
+    @property
+    def is_animated(self):
+        if self._is_animated is None:
+            current = self.tell()
+
+            try:
+                self.seek(1)
+                self._is_animated = True
+            except EOFError:
+                self._is_animated = False
+
+            self.seek(current)
+        return self._is_animated
+
     def seek(self, frame):
         "Select a given frame as current image"
         self._seek(max(frame, 0))  # Questionable backwards compatibility.

Tests/test_file_dcx.py

@@ -33,6 +33,7 @@ class TestFileDcx(PillowTestCase):
     def test_n_frames(self):
         im = Image.open(TEST_FILE)
         self.assertEqual(im.n_frames, 1)
+        self.assertFalse(im.is_animated)
 
     def test_eoferror(self):
         im = Image.open(TEST_FILE)

Tests/test_file_fli.py

@@ -21,6 +21,7 @@ class TestFileFli(PillowTestCase):
     def test_n_frames(self):
         im = Image.open(test_file)
         self.assertEqual(im.n_frames, 1)
+        self.assertFalse(im.is_animated)
 
     def test_eoferror(self):
         im = Image.open(test_file)

Tests/test_file_gif.py

@@ -137,9 +137,11 @@ class TestFileGif(PillowTestCase):
     def test_n_frames(self):
         im = Image.open(TEST_GIF)
         self.assertEqual(im.n_frames, 1)
+        self.assertFalse(im.is_animated)
 
         im = Image.open("Tests/images/iss634.gif")
         self.assertEqual(im.n_frames, 42)
+        self.assertTrue(im.is_animated)
 
     def test_eoferror(self):
         im = Image.open(TEST_GIF)

Tests/test_file_im.py

@@ -18,6 +18,7 @@ class TestFileIm(PillowTestCase):
     def test_n_frames(self):
         im = Image.open(TEST_IM)
         self.assertEqual(im.n_frames, 1)
+        self.assertFalse(im.is_animated)
 
     def test_eoferror(self):
         im = Image.open(TEST_IM)

Tests/test_file_mpo.py

@@ -98,6 +98,7 @@ class TestFileMpo(PillowTestCase):
     def test_n_frames(self):
         im = Image.open("Tests/images/sugarshack.mpo")
         self.assertEqual(im.n_frames, 2)
+        self.assertTrue(im.is_animated)
 
     def test_eoferror(self):
         im = Image.open("Tests/images/sugarshack.mpo")

Tests/test_file_psd.py

@@ -19,9 +19,11 @@ class TestImagePsd(PillowTestCase):
     def test_n_frames(self):
         im = Image.open("Tests/images/hopper_merged.psd")
         self.assertEqual(im.n_frames, 1)
+        self.assertFalse(im.is_animated)
 
         im = Image.open(test_file)
         self.assertEqual(im.n_frames, 2)
+        self.assertTrue(im.is_animated)
 
     def test_eoferror(self):
         im = Image.open(test_file)

Tests/test_file_spider.py

@@ -45,6 +45,7 @@ class TestImageSpider(PillowTestCase):
     def test_n_frames(self):
         im = Image.open(TEST_FILE)
         self.assertEqual(im.n_frames, 1)
+        self.assertFalse(im.is_animated)
 
     def test_loadImageSeries(self):
         # Arrange

Tests/test_file_tiff.py

@@ -153,9 +153,11 @@ class TestFileTiff(PillowTestCase):
     def test_n_frames(self):
         im = Image.open('Tests/images/multipage-lastframe.tif')
         self.assertEqual(im.n_frames, 1)
+        self.assertFalse(im.is_animated)
 
         im = Image.open('Tests/images/multipage.tiff')
         self.assertEqual(im.n_frames, 3)
+        self.assertTrue(im.is_animated)
 
     def test_eoferror(self):
         im = Image.open('Tests/images/multipage-lastframe.tif')