Removed incorrect detection of the alpha channel for the merged image.

diff --git a/coders/psd.c b/coders/psd.c
index 5df18a9cb6a2c643da51a8f3f14605c8d9b4a62e..8148281da364f4a10f45ee1a2d394bd7d6f24ceb 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -2172,8 +2172,6 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception)
     {
       psd_info.min_channels=4;
       (void) SetImageColorspace(image,CMYKColorspace,exception);
-      if (psd_info.channels > 4)
-        (void) SetImageAlphaChannel(image,ActivateAlphaChannel,exception);
     }
   else if ((psd_info.mode == BitmapMode) || (psd_info.mode == GrayscaleMode) ||
            (psd_info.mode == DuotoneMode))
@@ -2190,12 +2188,7 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception)
         }
       psd_info.min_channels=1;
       (void) SetImageColorspace(image,GRAYColorspace,exception);
-      if (psd_info.channels > 1)
-        (void) SetImageAlphaChannel(image,ActivateAlphaChannel,exception);
     }
-  else
-    if (psd_info.channels > 3)
-      (void) SetImageAlphaChannel(image,ActivateAlphaChannel,exception);
   if (psd_info.channels < psd_info.min_channels)
     ThrowReaderException(CorruptImageError,"ImproperImageHeader");
   /*