python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-11 08:42:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2650 from hugovk/fix-fli-seek-load

Browse Source 
Test animated FLI file
This commit is contained in:
wiredfool 2017-08-16 11:44:35 +01:00 committed by GitHub
commit b56d533aea
3 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PIL/FliImagePlugin.py
View File

@ -56,7 +56,7 @@ class FliImageFile(ImageFile.ImageFile):
# animation speed # animation speed
duration = i32(s[16:20]) duration = i32(s[16:20])
if magic == 0xAF11: if magic == 0xAF11:
duration = (duration * 1000) / 70 duration = (duration * 1000) // 70
self.info["duration"] = duration self.info["duration"] = duration
# look for palette # look for palette
@ -176,6 +176,7 @@ class FliImageFile(ImageFile.ImageFile):
def tell(self): def tell(self):
return self.__frame return self.__frame
# #
# registry # registry

BIN
Tests/images/a.fli Normal file
View File

Binary file not shown.

41
Tests/test_file_fli.py
View File

@ -4,17 +4,28 @@ from PIL import Image, FliImagePlugin
# created as an export of a palette image from Gimp2.6 # created as an export of a palette image from Gimp2.6
# save as...-> hopper.fli, default options. # save as...-> hopper.fli, default options.
test_file = "Tests/images/hopper.fli" static_test_file = "Tests/images/hopper.fli"
# From https://samples.libav.org/fli-flc/
animated_test_file = "Tests/images/a.fli"
class TestFileFli(PillowTestCase): class TestFileFli(PillowTestCase):
def test_sanity(self): def test_sanity(self):
im = Image.open(test_file) im = Image.open(static_test_file)
im.load() im.load()
self.assertEqual(im.mode, "P") self.assertEqual(im.mode, "P")
self.assertEqual(im.size, (128, 128)) self.assertEqual(im.size, (128, 128))
self.assertEqual(im.format, "FLI") self.assertEqual(im.format, "FLI")
self.assertFalse(im.is_animated)
im = Image.open(animated_test_file)
self.assertEqual(im.mode, "P")
self.assertEqual(im.size, (320, 200))
self.assertEqual(im.format, "FLI")
self.assertEqual(im.info["duration"], 71)
self.assertTrue(im.is_animated)
def test_invalid_file(self): def test_invalid_file(self):
invalid_file = "Tests/images/flower.jpg" invalid_file = "Tests/images/flower.jpg"
@ -23,12 +34,16 @@ class TestFileFli(PillowTestCase):
lambda: FliImagePlugin.FliImageFile(invalid_file)) lambda: FliImagePlugin.FliImageFile(invalid_file))
def test_n_frames(self): def test_n_frames(self):
im = Image.open(test_file) im = Image.open(static_test_file)
self.assertEqual(im.n_frames, 1) self.assertEqual(im.n_frames, 1)
self.assertFalse(im.is_animated) self.assertFalse(im.is_animated)
im = Image.open(animated_test_file)
self.assertEqual(im.n_frames, 385)
self.assertTrue(im.is_animated)
def test_eoferror(self): def test_eoferror(self):
im = Image.open(test_file) im = Image.open(animated_test_file)
n_frames = im.n_frames n_frames = im.n_frames
while True: while True:
@ -39,6 +54,24 @@ class TestFileFli(PillowTestCase):
except EOFError: except EOFError:
self.assertLess(im.tell(), n_frames) self.assertLess(im.tell(), n_frames)
def test_seek_tell(self):
im = Image.open(animated_test_file)
layer_number = im.tell()
self.assertEqual(layer_number, 0)
im.seek(0)
layer_number = im.tell()
self.assertEqual(layer_number, 0)
im.seek(1)
layer_number = im.tell()
self.assertEqual(layer_number, 1)
im.seek(2)
layer_number = im.tell()
self.assertEqual(layer_number, 2)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()