From 4ebe7fc45964607b04a3c97526497dc282c733b4 Mon Sep 17 00:00:00 2001
From: tdesvenain <thomas.desvenain@gmail.com>
Date: Sun, 29 Jul 2012 15:48:40 +0200
Subject: [PATCH] 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

---
 PIL/PsdImagePlugin.py | 11 ++++++++---
 docs/HISTORY.txt      |  6 +++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/PIL/PsdImagePlugin.py b/PIL/PsdImagePlugin.py
index 9d1b17a36..a3fa75368 100644
--- a/PIL/PsdImagePlugin.py
+++ b/PIL/PsdImagePlugin.py
@@ -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))
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index 3d0e6a4b9..4e61263a7 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -5,6 +5,10 @@ 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 +42,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)