Merge pull request #5 from tdesvenain/master

More psd files handled

PIL/PsdImagePlugin.py

@@ -57,7 +57,7 @@ class PsdImageFile(ImageFile.ImageFile):
     format_description = "Adobe Photoshop"
 
     def _open(self):
-
+        
         read = self.fp.read
 
         #
@@ -165,7 +165,6 @@ def _layerinfo(file):
     # read layerinfo block
     layers = []
     read = file.read
-
     for i in range(abs(i16(read(2)))):
 
         # bounding box
@@ -175,12 +174,18 @@ def _layerinfo(file):
         # image info
         info = []
         mode = []
-        for i in range(i16(read(2))):
+        types = range(i16(read(2)))
+        if len(types) > 4:
+            continue
+
+        for i in types:
             type = i16(read(2))
+
             if type == 65535:
                 m = "A"
             else:
-                m = "RGB"[type]
+                m = "RGBA"[type]
+
             mode.append(m)
             size = i32(read(4))
             info.append((m, size))

docs/HISTORY.txt

@@ -5,6 +5,11 @@ Changelog
 1.7.8 (Unreleased)
 ------------------
 
+- Fix opening psd files with RGBA layers when A mode is not of type 65535 but 3.
+  Fixes issue https://github.com/python-imaging/Pillow/issues/3
+  [thomasdesvenain]
+
+
 1.7.7 (2012-04-04)
 ------------------
 
@@ -38,7 +43,7 @@ Changelog
 1.7.3 (2011-07-20)
 ------------------
 
-- Fix : resize need int values, append int conversion in thumbnail method 
+- Fix : resize need int values, append int conversion in thumbnail method
   [harobed]
 
 1.7.2 (2011-06-02)