(no commit message)

diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index d5ceec4b7561dcbb6c3bafce56686bde4caf8276..3fbe056313c5b8aaebff42cd9035bafcc74dbcc7 100644 (file)
--- a/MagickCore/blob.c
+++ b/MagickCore/blob.c
@@ -1760,9 +1760,7 @@ MagickExport unsigned char *ImagesToBlob(const ImageInfo *image_info,
           images->blob->exempt=MagickTrue;
           *images->filename='\0';
           status=WriteImages(blob_info,images,images->filename,exception);
-          if ((status == MagickFalse) || (images->blob->length == 0))
-            InheritException(exception,&images->exception);
-          else
+          if ((status != MagickFalse) && (images->blob->length != 0))
             {
               *length=images->blob->length;
               blob=DetachBlob(images->blob);
@@ -1798,9 +1796,7 @@ MagickExport unsigned char *ImagesToBlob(const ImageInfo *image_info,
                 images->magick,unique);
               status=WriteImages(blob_info,images,filename,exception);
               (void) fclose(blob_info->file);
-              if (status == MagickFalse)
-                InheritException(exception,&images->exception);
-              else
+              if (status != MagickFalse)
                 blob=FileToBlob(images->filename,~0UL,length,exception);
             }
           (void) RelinquishUniqueFileResource(unique);

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 8273712b00750ea2c1a2a0caf879c23543bd1e65..7378a3630ce43594ba96914613ad895a79872556 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -3995,7 +3995,6 @@ MagickExport Image *PolaroidImage(const Image *image,const DrawInfo *draw_info,
   picture_image=DestroyImage(picture_image);
   if (bend_image == (Image *) NULL)
     return((Image *) NULL);
-  InheritException(&bend_image->exception,exception);
   picture_image=bend_image;
   rotate_image=RotateImage(picture_image,-90.0,exception);
   picture_image=DestroyImage(picture_image);

diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index fa62b433c9884d8e3298cd54d8ae4886b30091a7..d08f55027007f39a508ebea61d9ee24c9ce6c5a0 100644 (file)
--- a/MagickCore/montage.c
+++ b/MagickCore/montage.c
@@ -822,7 +822,6 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
               shadow_image=ShadowImage(image,80.0,2.0,5,5,exception);
               if (shadow_image != (Image *) NULL)
                 {
-                  InheritException(&shadow_image->exception,exception);
                   (void) CompositeImage(shadow_image,OverCompositeOp,image,0,0);
                   image=DestroyImage(image);
                   image=shadow_image;