commit 245cc757e4d673ce07b090b09064951f3d029896
author dirk <dirk@git.imagemagick.org> Thu Jan 16 18:31:58 2014 +0000
committer dirk <dirk@git.imagemagick.org> Thu Jan 16 18:31:58 2014 +0000
tree 000c4150645e1cbe18f481a79f4dca2a0901c360
parent e7bee033567d3f7d7406a91123da1461c37b3000

Ignore user supplied layer mask.

coders/psd.c

diff --git a/coders/psd.c b/coders/psd.c
index 5c07c3d..f88cce6 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -912,7 +912,7 @@
 
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(CoderEvent,GetMagickModule(),
-       "      layer data is RLE compressed");
+       "      layer data is ZIP compressed");
 
   compact_pixels=(unsigned char *) AcquireQuantumMemory(compact_size,
     sizeof(*compact_pixels));
@@ -1016,6 +1016,13 @@
   MagickStatusType
     status;
 
+  if (layer_info->channel_info[channel].type < -1)
+  {
+    /* ignore user supplied layer mask */
+    SeekBlob(image,layer_info->channel_info[channel].size-2,SEEK_CUR);
+    return(MagickTrue);
+  }
+
   offset=TellBlob(image);
   status=MagickTrue;
   switch(compression)