From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 12 Oct 2010 18:55:20 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~8689
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e2e46fd1e26977ba20a171469d3cdcb1013c46a;p=imagemagick

---

diff --git a/coders/psd.c b/coders/psd.c
index 496992ba5..4037ffa68 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -912,14 +912,6 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception)
       (void) ParseImageResourceBlocks(image,blocks,(size_t) length);
       blocks=(unsigned char *) RelinquishMagickMemory(blocks);
     }
-  /*
-    If we are only "pinging" the image, then we're done - so return.
-  */
-  if (image_info->ping != MagickFalse)
-    {
-      (void) CloseBlob(image);
-      return(GetFirstImageInList(image));
-    }
   /*
     Layer and mask block.
   */
@@ -1185,7 +1177,8 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception)
             if (image->debug != MagickFalse)
               (void) LogMagickEvent(CoderEvent,GetMagickModule(),
                 "    setting up new layer image");
-            (void) SetImageBackgroundColor(layer_info[i].image);
+            if (image_info->ping != MagickFalse)
+              (void) SetImageBackgroundColor(layer_info[i].image);
             layer_info[i].image->compose=
               PSDBlendModeToCompositeOperator(layer_info[i].blendkey);
             if (layer_info[i].visible == MagickFalse)