Merge pull request #2061 from wiredfool/j2k-access

Added return for J2k (and fpx) Load to return a pixel access object
python-pillow · Aug 25, 2016 · 0444b49 · 0444b49
2 parents 581014e + 2120976
commit 0444b49
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/PIL/FpxImagePlugin.py b/PIL/FpxImagePlugin.py
@@ -216,7 +216,7 @@ def load(self):
             self.fp = self.ole.openstream(self.stream[:2] +
                                           ["Subimage 0000 Data"])
 
-        ImageFile.ImageFile.load(self)
+        return ImageFile.ImageFile.load(self)
 
 #
 # --------------------------------------------------------------------

diff --git a/PIL/Jpeg2KImagePlugin.py b/PIL/Jpeg2KImagePlugin.py
@@ -207,7 +207,7 @@ def load(self):
             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):

diff --git a/Tests/test_file_jpeg2k.py b/Tests/test_file_jpeg2k.py
@@ -34,7 +34,8 @@ def test_sanity(self):
         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')