From f5243338800cf62d09d7e6f8018a5c8220adbeff Mon Sep 17 00:00:00 2001
From: wiredfool <eric-github@soroos.net>
Date: Wed, 20 Aug 2014 21:43:46 -0700
Subject: [PATCH] Tests for multipage tiffs

---
 Tests/images/multipage-lastframe.tif      | Bin 0 -> 296 bytes
 Tests/images/{test.tif => multipage.tiff} | Bin
 Tests/test_file_libtiff.py                |  29 ++++++++++++++++++++++
 Tests/test_file_tiff.py                   |  28 ++++++++++++++++++++-
 4 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 Tests/images/multipage-lastframe.tif
 rename Tests/images/{test.tif => multipage.tiff} (100%)

diff --git a/Tests/images/multipage-lastframe.tif b/Tests/images/multipage-lastframe.tif
new file mode 100644
index 0000000000000000000000000000000000000000..aeba534e25a9f0527c5fe1674461d4b484b67159
GIT binary patch
literal 296
zcmebD)M9X9pbQ8wFfcMRFaiw`0b)iZHWQQ$l4C|<vq9O+KyfZ4ab89y26nI*1A`zV
z3)oB!AYTYcjVKaZ49Z@`#lRpARc`}SFN35;6Ub%)iUD25U<foHs1#@(1A_xloDIm9
h0XYr`a`j3w)6y6iJd4s2^TIMy%OS!*^8bGZ1_10<3+4a-

literal 0
HcmV?d00001

diff --git a/Tests/images/test.tif b/Tests/images/multipage.tiff
similarity index 100%
rename from Tests/images/test.tif
rename to Tests/images/multipage.tiff
diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py
index 60eea8b3b..c784ac55d 100644
--- a/Tests/test_file_libtiff.py
+++ b/Tests/test_file_libtiff.py
@@ -311,6 +311,35 @@ class TestFileLibTiff(PillowTestCase):
         self.assertRaises(OSError, lambda: os.fstat(fn))
         self.assertRaises(OSError, lambda: os.close(fn))
 
+    def test_multipage(self):
+        # issue #862
+        TiffImagePlugin.READ_LIBTIFF = True
+        im = Image.open('Tests/images/multipage.tiff')
+        # file is a multipage tiff,  10x10 green, 10x10 red, 20x20 blue
+
+        im.seek(0)
+        self.assertEqual(im.size, (10,10))
+        self.assertEqual(im.convert('RGB').getpixel((0,0)), (0,128,0))
+        self.assertTrue(im.tag.next)
+
+        im.seek(1)
+        self.assertEqual(im.size, (10,10))
+        self.assertEqual(im.convert('RGB').getpixel((0,0)), (255,0,0))
+        self.assertTrue(im.tag.next)
+
+        im.seek(2)
+        self.assertFalse(im.tag.next)
+        self.assertEqual(im.size, (20,20))
+        self.assertEqual(im.convert('RGB').getpixel((0,0)), (0,0,255))
+        
+        TiffImagePlugin.READ_LIBTIFF = False
+
+    def test__next(self):
+        TiffImagePlugin.READ_LIBTIFF = True
+        im = Image.open('Tests/images/lena.tif')
+        self.assertFalse(im.tag.next)
+        im.load()
+        self.assertFalse(im.tag.next)
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py
index 9c832c206..464f1c314 100644
--- a/Tests/test_file_tiff.py
+++ b/Tests/test_file_tiff.py
@@ -1,6 +1,6 @@
 from helper import unittest, PillowTestCase, lena, py3
 
-from PIL import Image
+from PIL import Image, TiffImagePlugin
 
 
 class TestFileTiff(PillowTestCase):
@@ -141,6 +141,32 @@ class TestFileTiff(PillowTestCase):
         self.assertEqual(
             im.getextrema(), (-3.140936851501465, 3.140684127807617))
 
+    def test_multipage(self):
+        # issue #862
+        im = Image.open('Tests/images/multipage.tiff')
+        # file is a multipage tiff,  10x10 green, 10x10 red, 20x20 blue
+
+        im.seek(0)
+        self.assertEqual(im.size, (10,10))
+        self.assertEqual(im.convert('RGB').getpixel((0,0)), (0,128,0))
+
+        im.seek(1)
+        im.load()
+        self.assertEqual(im.size, (10,10))
+        self.assertEqual(im.convert('RGB').getpixel((0,0)), (255,0,0))
+
+        im.seek(2)
+        im.load()
+        self.assertEqual(im.size, (20,20))
+        self.assertEqual(im.convert('RGB').getpixel((0,0)), (0,0,255))      
+
+    def test_multipage_last_frame(self):
+        im = Image.open('Tests/images/multipage-lastframe.tif')
+        im.load()
+        self.assertEqual(im.size, (20,20))
+        self.assertEqual(im.convert('RGB').getpixel((0,0)), (0,0,255))      
+        
+
     def test___str__(self):
         # Arrange
         file = "Tests/images/pil136.tiff"