From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 8 Apr 2015 22:04:41 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90de83d3fe5221a8896ab53556c2e7992078a96c;p=imagemagick

---

diff --git a/coders/psd.c b/coders/psd.c
index 53f6c9e43..3416aa863 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -229,7 +229,7 @@ static MagickBooleanType IsPSD(const unsigned char *magick,const size_t length)
 %
 %  The format of the ReadPSDImage method is:
 %
-%      Image *ReadPSDImage(image_info)
+%      Image *ReadPSDImage(image_info,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -1582,8 +1582,7 @@ static MagickStatusType ReadPSDMergedImage(Image* image,
   return(status);
 }
 
-static Image *ReadPSDImage(const ImageInfo *image_info,
-  ExceptionInfo *exception)
+static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception)
 {
   Image
     *image;
@@ -1810,35 +1809,27 @@ static Image *ReadPSDImage(const ImageInfo *image_info,
       */
       SeekBlob(image,offset+length,SEEK_SET);
     }
-  /*
-    If we are only "pinging" the image, then we're done - so return.
-  */
-  if (image_info->ping != MagickFalse)
-    {
-      (void) CloseBlob(image);
-      return(GetFirstImageInList(image));
-    }
   /*
     Read the precombined layer, present for PSD < 4 compatibility.
   */
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(CoderEvent,GetMagickModule(),
       "  reading the precombined layer");
-  if (has_merged_image != MagickFalse || GetImageListLength(image) == 1)
+  if ((has_merged_image != MagickFalse) || (GetImageListLength(image) == 1))
     has_merged_image=(MagickBooleanType) ReadPSDMergedImage(image,&psd_info,
       exception);
-  if (has_merged_image == MagickFalse && GetImageListLength(image) == 1 &&
-    length != 0)
+  if ((has_merged_image == MagickFalse) && (GetImageListLength(image) == 1) &&
+      (length != 0))
     {
       SeekBlob(image,offset,SEEK_SET);
-      if (ReadPSDLayers(image,image_info,&psd_info,MagickFalse,exception) !=
-          MagickTrue)
+      status=ReadPSDLayers(image,image_info,&psd_info,MagickFalse,exception);
+      if (status != MagickTrue)
         {
           (void) CloseBlob(image);
           return((Image *) NULL);
         }
     }
-  if (has_merged_image == MagickFalse && GetImageListLength(image) > 1)
+  if ((has_merged_image == MagickFalse) && (GetImageListLength(image) > 1))
     {
       Image
         *merged;