]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Sat, 28 Jul 2012 12:57:17 +0000 (12:57 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Sat, 28 Jul 2012 12:57:17 +0000 (12:57 +0000)
MagickCore/composite.c

index 0ad7b83495cf9466cf62ff5941c07e5505072e76..07c4c7ca4371c7bd5e7b914b24ac68ae104c5c5d 100644 (file)
@@ -1,4 +1,4 @@
-/*
+  /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
 %                                                                             %
@@ -870,6 +870,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
       resample_filter=DestroyResampleFilter(resample_filter);
       composite_view=DestroyCacheView(composite_view);
       destination_view=DestroyCacheView(destination_view);
+      composite_image=DestroyImage(composite_image);
       composite_image=destination_image;
       break;
     }
@@ -1044,6 +1045,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
       destination_view=DestroyCacheView(destination_view);
       composite_view=DestroyCacheView(composite_view);
       image_view=DestroyCacheView(image_view);
+      composite_image=DestroyImage(composite_image);
       composite_image=destination_image;
       break;
     }
@@ -2303,7 +2305,8 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
   image_view=DestroyCacheView(image_view);
   if (destination_image != (Image * ) NULL)
     destination_image=DestroyImage(destination_image);
-  composite_image=DestroyImage(composite_image);
+  else
+    composite_image=DestroyImage(composite_image);
   return(status);
 }
 \f