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

Merge pull request #2061 from wiredfool/j2k-access

Browse Source 
Added return for J2k (and fpx) Load to return a pixel access object
This commit is contained in:
wiredfool 2016-08-25 12:26:18 +01:00 committed by GitHub
commit 0444b4935b
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PIL/FpxImagePlugin.py
View File

@ -216,7 +216,7 @@ class FpxImageFile(ImageFile.ImageFile):
self.fp = self.ole.openstream(self.stream[:2] +
["Subimage 0000 Data"])
ImageFile.ImageFile.load(self)
return ImageFile.ImageFile.load(self)
#
# --------------------------------------------------------------------

2
PIL/Jpeg2KImagePlugin.py
View File

@ -207,7 +207,7 @@ class Jpeg2KImageFile(ImageFile.ImageFile):
t3 = (t[3][0], self.reduce, self.layers, t[3][3], t[3][4])
self.tile = [(t[0], (0, 0) + self.size, t[2], t3)]
ImageFile.ImageFile.load(self)
return ImageFile.ImageFile.load(self)
def _accept(prefix):

3
Tests/test_file_jpeg2k.py
View File

@ -34,7 +34,8 @@ class TestFileJpeg2k(PillowTestCase):
self.assertRegexpMatches(Image.core.jp2klib_version, '\d+\.\d+\.\d+$')
im = Image.open('Tests/images/test-card-lossless.jp2')
im.load()
px = im.load()
self.assertEqual(px[0,0], (0, 0, 0))
self.assertEqual(im.mode, 'RGB')
self.assertEqual(im.size, (640, 480))
self.assertEqual(im.format, 'JPEG2000')