(no commit message)

diff --git a/coders/psd.c b/coders/psd.c
index 02d7ce02bd3e077393fccd7c205ddcf7d75ff0b9..4591d3da9a84f271a2f696ef8898589aba471415 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -986,14 +986,14 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception)
         }
       if (size != 0)
         {
+          MagickOffsetType
+            layer_offset;
+
           image->matte=psd_info.channels > psd_info.color_channels ?  MagickTrue : MagickFalse;
-          
+
           if (image->debug != MagickFalse)
             (void) LogMagickEvent(CoderEvent,GetMagickModule(),
               image->matte ? "  image has matte" : "  image has no matte");
-          
-          MagickOffsetType
-            layer_offset;
 
           layer_offset=offset+length;
           number_layers=(short) ReadBlobMSBShort(image);

diff --git a/coders/xtrn.c b/coders/xtrn.c
index 4fbb2b24e0253162475f8f23e2087c24461d53f7..41794d09254e5508d8889eaf0314d70592547a00 100644 (file)
--- a/coders/xtrn.c
+++ b/coders/xtrn.c
@@ -148,7 +148,7 @@ static Image *ReadXTRNImage(const ImageInfo *image_info,
       (void) sscanf(clone_info->filename,"%lx,%lx",&param1,&param2);
       image_ptr=(Image **) param2;
       if (*image_ptr != (Image *)NULL)
-        image=CloneImage(*image_ptr,0,0,MagickFalse,&(*image_ptr)->exception);
+        image=CloneImage(*image_ptr,0,0,MagickFalse,exception);
 #ifdef ALL_IMAGEINFO
       image_info_ptr=(ImageInfo **) param1;
       if (*image_info_ptr != (ImageInfo *)NULL)
@@ -477,7 +477,8 @@ size_t SafeArrayFifo(const Image *image,const void *data,const size_t length)
   return(tlen);
 }
 
-static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image,ExceptionInfo *exception)
+static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,
+  Image *image,ExceptionInfo *exception)
 {
   Image *
     p;
@@ -595,7 +596,7 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image
           SetImageInfo(clone_info,1,exception);
           (void) CopyMagickString(image->magick,clone_info->magick,
             MaxTextExtent);
-          status=WriteStream(clone_info,image,fifo);
+          status=WriteStream(clone_info,image,fifo,exception);
           if (status == MagickFalse)
             CatchImageException(image);
         }
@@ -624,7 +625,7 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image
           SetImageInfo(clone_info,1,exception);
           (void) CopyMagickString(image->magick,clone_info->magick,
             MaxTextExtent);
-          status=WriteStream(clone_info,image,SafeArrayFifo);
+          status=WriteStream(clone_info,image,SafeArrayFifo,exception);
           if (status == MagickFalse)
             CatchImageException(image);
         }