Merge 8502503 into 648030e

python-pillow · Feb 29, 2016 · b2d4c41 · b2d4c41
2 parents 648030e + 8502503
commit b2d4c41
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/PIL/TiffImagePlugin.py b/PIL/TiffImagePlugin.py
@@ -1066,6 +1066,13 @@ def _setup(self):
         if 0xBC01 in self.tag_v2:
             raise IOError("Windows Media Photo files not yet supported")
 
+        try:
+            #restore pointer to load method
+            self.load = self._load 
+        except AttributeError:
+            #save pointer to parent load method
+            self._load = super(TiffImageFile,self).load 
+
         # extract relevant tags
         self._compression = COMPRESSION_INFO[self.tag_v2.get(COMPRESSION, 1)]
         self._planar_configuration = self.tag_v2.get(PLANAR_CONFIGURATION, 1)

diff --git a/Tests/images/compression.tif b/Tests/images/compression.tif
diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py
@@ -378,6 +378,22 @@ def test_deprecation_warning_with_spaces(self):
         self.assertEqual(im.tag_v2[X_RESOLUTION], 36)
         self.assertEqual(im.tag_v2[Y_RESOLUTION], 72)
 
+    def test_multipage_compression(self):
+        im = Image.open('Tests/images/compression.tif')
+
+        im.seek(0)
+        self.assertEqual(im._compression,'tiff_ccitt')
+        self.assertEqual(im.size, (10, 10))
+
+        im.seek(1)
+        self.assertEqual(im._compression,'packbits')
+        self.assertEqual(im.size, (10, 10))
+        im.load()
+
+        im.seek(0)
+        self.assertEqual(im._compression,'tiff_ccitt')
+        self.assertEqual(im.size, (10, 10))
+        im.load()
 
 if __name__ == '__main__':
     unittest.main()