From 5c3b10ee87d9a3c06bd438ce20d821cdc206e2c1 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Mon, 27 Feb 2017 15:41:28 +0200
Subject: [PATCH 1/4] Test PSD for similarity

---
 Tests/test_file_psd.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Tests/test_file_psd.py b/Tests/test_file_psd.py
index 2b4825734..bd1aca66c 100644
--- a/Tests/test_file_psd.py
+++ b/Tests/test_file_psd.py
@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase
+from helper import hopper, unittest, PillowTestCase
 
 from PIL import Image, PsdImagePlugin
 
@@ -15,6 +15,9 @@ class TestImagePsd(PillowTestCase):
         self.assertEqual(im.size, (128, 128))
         self.assertEqual(im.format, "PSD")
 
+        im2 = hopper()
+        self.assert_image_similar(im, im2, 4.8)
+
     def test_invalid_file(self):
         invalid_file = "Tests/images/flower.jpg"
 

From 921a25d144c56bb4cb4213d3739f671d69e4aa53 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Mon, 27 Feb 2017 16:09:05 +0200
Subject: [PATCH 2/4] Test PSD seek

---
 Tests/test_file_psd.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/Tests/test_file_psd.py b/Tests/test_file_psd.py
index bd1aca66c..dd75a31c9 100644
--- a/Tests/test_file_psd.py
+++ b/Tests/test_file_psd.py
@@ -46,6 +46,29 @@ class TestImagePsd(PillowTestCase):
             except EOFError:
                 self.assertTrue(im.tell() < n_frames)
 
+    def test_seek_tell(self):
+        im = Image.open(test_file)
+
+        layer_number = im.tell()
+        self.assertEqual(layer_number, 0)
+
+        im.seek(0)
+        layer_number = im.tell()
+        self.assertEqual(layer_number, 0)
+
+        im.seek(1)
+        layer_number = im.tell()
+        self.assertEqual(layer_number, 1)
+
+        im.seek(2)
+        layer_number = im.tell()
+        self.assertEqual(layer_number, 2)
+
+    def test_seek_eoferror(self):
+        im = Image.open(test_file)
+
+        self.assertRaises(EOFError, lambda: im.seek(-1))
+
 
 if __name__ == '__main__':
     unittest.main()

From 1a607bfd56b348b85c6c4d7506c9919c8457211f Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Mon, 27 Feb 2017 16:45:31 +0200
Subject: [PATCH 3/4] Resave hopper.psd with ICC profile, using Photoshop

---
 Tests/images/hopper.psd | Bin 171559 -> 175119 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Tests/images/hopper.psd b/Tests/images/hopper.psd
index e8b184cf5a3f111cf2b9b6af8426b5264f96a7eb..5ec686ca0220f8d392ead8231355a67b0af80e2b 100644
GIT binary patch
delta 3452
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
BO>Y1I

delta 182
zcmeCb!L@u3*8~N=L<b8ePhS=m1`rURXr?0bu3lRy@m#I1vx}3y=)`pk!SX5~X{U!9
z%dRs|o+2nQIh92ZL~mZr;=nZ7K~Qls4|^>4W=WBDV*%z*Ahir!3=IFlVDl{Z&n%pR
zU_nMkhRt^(+C?-?tPCuzjEofw&8-Y9tV}H!7+5ASFt7s^u^1Q`87^RCU<R@o|Nn39
Q$!+h+W!&DA%hYTK0RF@?!~g&Q


From df2a0319414d9b352def799e42513870f78cf989 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Mon, 27 Feb 2017 17:21:27 +0200
Subject: [PATCH 4/4] Test PSD with and without ICC profile

---
 Tests/test_file_psd.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Tests/test_file_psd.py b/Tests/test_file_psd.py
index dd75a31c9..04a171cbb 100644
--- a/Tests/test_file_psd.py
+++ b/Tests/test_file_psd.py
@@ -69,6 +69,18 @@ class TestImagePsd(PillowTestCase):
 
         self.assertRaises(EOFError, lambda: im.seek(-1))
 
+    def test_icc_profile(self):
+        im = Image.open(test_file)
+        self.assertIn("icc_profile", im.info)
+
+        icc_profile = im.info["icc_profile"]
+        self.assertEqual(len(icc_profile), 3144)
+
+    def test_no_icc_profile(self):
+        im = Image.open("Tests/images/hopper_merged.psd")
+
+        self.assertNotIn("icc_profile", im.info)
+
 
 if __name__ == '__main__':
     unittest.main()