(no commit message)

diff --git a/coders/cmyk.c b/coders/cmyk.c
index a20ec2d84c127378f4793c1362a9dc488d9956f2..78989b0be746df8f915a6b3c52cab150ea775849 100644 (file)
--- a/coders/cmyk.c
+++ b/coders/cmyk.c
@@ -1080,8 +1080,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
       }
     scene++;
   } while (count == (ssize_t) length);
-  InheritException(exception,&image->exception);
   quantum_info=DestroyQuantumInfo(quantum_info);
+  InheritException(&image->exception,&canvas_image->exception);
   canvas_image=DestroyImage(canvas_image);
   (void) CloseBlob(image);
   return(GetFirstImageInList(image));

diff --git a/coders/gray.c b/coders/gray.c
index 110f02657ca7f959c5930a29cc31a8327a049d94..a3e913940f47fb7eb7ffea6442036d984663a292 100644 (file)
--- a/coders/gray.c
+++ b/coders/gray.c
@@ -276,7 +276,7 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
     scene++;
   } while (count == (ssize_t) length);
   quantum_info=DestroyQuantumInfo(quantum_info);
-  InheritException(exception,&canvas_image->exception);
+  InheritException(&image->exception,&canvas_image->exception);
   canvas_image=DestroyImage(canvas_image);
   (void) CloseBlob(image);
   return(GetFirstImageInList(image));

diff --git a/coders/raw.c b/coders/raw.c
index 406ccc0744646a2fdb53853cc10393d26e47aabb..dfa92f45dd57e7977aaff75d344fce2a9f9d26e0 100644 (file)
--- a/coders/raw.c
+++ b/coders/raw.c
@@ -274,7 +274,7 @@ static Image *ReadRAWImage(const ImageInfo *image_info,
     scene++;
   } while (count == (ssize_t) length);
   quantum_info=DestroyQuantumInfo(quantum_info);
-  InheritException(exception,&canvas_image->exception);
+  InheritException(&image->exception,&canvas_image->exception);
   canvas_image=DestroyImage(canvas_image);
   (void) CloseBlob(image);
   return(GetFirstImageInList(image));

diff --git a/coders/rgb.c b/coders/rgb.c
index b062f09363128a12c85c774d61a86e52a3f8b202..47b1a5249259ee46023d3c0fd84203a550320b14 100644 (file)
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -595,8 +595,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception)
       }
     scene++;
   } while (count == (ssize_t) length);
-  InheritException(exception,&image->exception);
   quantum_info=DestroyQuantumInfo(quantum_info);
+  InheritException(&image->exception,&canvas_image->exception);
   canvas_image=DestroyImage(canvas_image);
   (void) CloseBlob(image);
   return(GetFirstImageInList(image));

diff --git a/coders/ycbcr.c b/coders/ycbcr.c
index 2546eab73e23dd9f63bff3db97bf2b538a705390..1a29b7dc05335e0fdbb615dc9b34888e49d3f4bf 100644 (file)
--- a/coders/ycbcr.c
+++ b/coders/ycbcr.c
@@ -838,8 +838,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
       }
     scene++;
   } while (count == (ssize_t) length);
-  InheritException(exception,&image->exception);
   quantum_info=DestroyQuantumInfo(quantum_info);
+  InheritException(&image->exception,&canvas_image->exception);
   canvas_image=DestroyImage(canvas_image);
   (void) CloseBlob(image);
   return(GetFirstImageInList(image));