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

Enabled seeking in MPO files.

Browse Source 
Note to self: either put the offset in the load_seek() definition or
the tile definition, not both.
This commit is contained in:
Eric W. Brown 2014-07-23 11:27:46 -04:00
parent 6605bf22e5
commit 832e11bed5
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PIL/MpoImagePlugin.py
View File

@ -49,14 +49,21 @@ class MpoImageFile(JpegImagePlugin.JpegImageFile):
self.__fp.seek(self.__mpoffsets[0]) # get ready to read first frame self.__fp.seek(self.__mpoffsets[0]) # get ready to read first frame
self.__frame = 0 self.__frame = 0
self.offset = 0 self.offset = 0
# for now we can only handle reading and individual frame extraction
self.readonly = 1
def load_seek(self, pos):
self.__fp.seek(pos)
def seek(self, frame): def seek(self, frame):
if frame < 0 or frame >= self.__framecount: if frame < 0 or frame >= self.__framecount:
raise EOFError("no more images in MPO file") raise EOFError("no more images in MPO file")
else: else:
self.fp = self.__fp self.fp = self.__fp
self.fp.seek(self.__mpoffsets[frame])
self.offset = self.__mpoffsets[frame] self.offset = self.__mpoffsets[frame]
self.tile = [
("jpeg", (0, 0) + self.size, self.offset, (self.mode, ""))
]
self.__frame = frame self.__frame = frame
def tell(self): def tell(self):

14
Tests/test_file_mpo.py
View File

@ -74,6 +74,20 @@ class TestFileMpo(PillowTestCase):
im.seek(0) im.seek(0)
self.assertEqual(im.tell(), 0) self.assertEqual(im.tell(), 0)
def test_image_grab(self):
for test_file in test_files:
im = Image.open(test_file)
self.assertEqual(im.tell(), 0)
im0 = im.tobytes()
im.seek(1)
self.assertEqual(im.tell(), 1)
im1 = im.tobytes()
im.seek(0)
self.assertEqual(im.tell(), 0)
im0 = im.tobytes()
self.assertEqual(im0, im02)
self.assertNotEqual(im0, im1)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()