(no commit message)

diff --git a/MagickCore/channel.c b/MagickCore/channel.c
index 6d5658af018ccddd6bcb7f5e805b4018c478df6b..24a0117423d733055b12815623645989d10fb1c4 100644 (file)
--- a/MagickCore/channel.c
+++ b/MagickCore/channel.c
@@ -576,9 +576,9 @@ MagickExport Image *CombineImages(const Image *image,
       }
   }
   combine_view=DestroyCacheView(combine_view);
+  (void) TransformImageColorspace(combine_image,colorspace,exception);
   if (status == MagickFalse)
     combine_image=DestroyImage(combine_image);
-  (void) TransformImageColorspace(combine_image,colorspace,exception);
   return(combine_image);
 }
 \f
@@ -738,6 +738,8 @@ MagickExport Image *SeparateImage(const Image *image,
   }
   separate_view=DestroyCacheView(separate_view);
   image_view=DestroyCacheView(image_view);
+  if (status == MagickFalse)
+    separate_image=DestroyImage(separate_image);
   return(separate_image);
 }
 \f

diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index 816e76d9792e047088423842bfd175793403ee24..49e411b71f5c0c30258cf58118bf672c990e41a8 100644 (file)
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -1669,5 +1669,7 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference,
       }
   }
   similarity_view=DestroyCacheView(similarity_view);
+  if (status == MagickFalse)
+    similarity_image=DestroyImage(similarity_image);
   return(similarity_image);
 }

diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c
index 0cb9a5fc94913341138ac61dce9f2e9b70f753b0..fe99ef616248826e9f135d399fff8db75ed5ae68 100644 (file)
--- a/MagickCore/decorate.c
+++ b/MagickCore/decorate.c
@@ -601,6 +601,8 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
       (void) CompositeImage(frame_image,image,compose,MagickTrue,x,y,
         exception);
     }
+  if (status == MagickFalse)
+    frame_image=DestroyImage(frame_image);
   return(frame_image);
 }
 \f

diff --git a/MagickCore/distort.c b/MagickCore/distort.c
index e3162d75cde9cd5b229a8042c39315fbdb193f15..2a81a32614703f3f3dfc0fb8df8cb907fb130338 100644 (file)
--- a/MagickCore/distort.c
+++ b/MagickCore/distort.c
@@ -1588,10 +1588,6 @@ MagickExport Image *DistortResizeImage(const Image *image,
   tmp_image=resize_image;
   resize_image=CropImage(tmp_image,&crop_area,exception);
   tmp_image=DestroyImage(tmp_image);
-
-  if ( resize_image == (Image *) NULL )
-    return((Image *) NULL);
-
   return(resize_image);
 }
 \f

diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 00dada13deb9599e26c80976aaaa9fcd749dd432..3068cbfa37bde351d9ef240d4d1de66acc907750 100644 (file)
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -1461,6 +1461,8 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception)
   }
   enhance_view=DestroyCacheView(enhance_view);
   image_view=DestroyCacheView(image_view);
+  if (status == MagickFalse)
+    enhance_image=DestroyImage(enhance_image);
   return(enhance_image);
 }
 \f
@@ -2620,13 +2622,13 @@ MagickExport MagickBooleanType LinearStretchImage(Image *image,
   CacheView
     *image_view;
 
-  MagickBooleanType
-    status;
-
   double
     *histogram,
     intensity;
 
+  MagickBooleanType
+    status;
+
   ssize_t
     black,
     white,
@@ -2637,8 +2639,7 @@ MagickExport MagickBooleanType LinearStretchImage(Image *image,
   */
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
-  histogram=(double *) AcquireQuantumMemory(MaxMap+1UL,
-    sizeof(*histogram));
+  histogram=(double *) AcquireQuantumMemory(MaxMap+1UL,sizeof(*histogram));
   if (histogram == (double *) NULL)
     ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
       image->filename);

diff --git a/MagickCore/image.c b/MagickCore/image.c
index e0dfb1936f08ea04d30b9ccfd65f0c8fe95c287e..8f9135d7db90cbe42cb1c6ba2635cd2d6e6898ca 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -1344,6 +1344,8 @@ MagickExport Image *GetImageMask(const Image *image,ExceptionInfo *exception)
   }
   mask_view=DestroyCacheView(mask_view);
   image_view=DestroyCacheView(image_view);
+  if (status == MagickFalse)
+    mask_image=DestroyImage(mask_image);
   return(mask_image);
 }
 \f

diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index 27a0c804051faadd4a541307c5487c098e19307a..c2ddd7a1bc8c09b6592984f165b6c138951e7b9a 100644 (file)
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -1934,14 +1934,11 @@ MagickExport Image *ShearImage(const Image *image,const double x_shear,
     }
   status=CropToFitImage(&shear_image,shear.x,shear.y,(double)
     image->columns,(double) image->rows,MagickFalse,exception);
-  if (status == MagickFalse)
-    {
-      shear_image=DestroyImage(shear_image);
-      return((Image *) NULL);
-    }
   shear_image->compose=image->compose;
   shear_image->page.width=0;
   shear_image->page.height=0;
+  if (status == MagickFalse)
+    shear_image=DestroyImage(shear_image);
   return(shear_image);
 }
 \f
@@ -2098,13 +2095,10 @@ MagickExport Image *ShearRotateImage(const Image *image,const double degrees,
     }
   status=CropToFitImage(&rotate_image,shear.x,shear.y,(double) width,
     (double) height,MagickTrue,exception);
-  if (status == MagickFalse)
-    {
-      rotate_image=DestroyImage(rotate_image);
-      return((Image *) NULL);
-    }
   rotate_image->compose=image->compose;
   rotate_image->page.width=0;
   rotate_image->page.height=0;
+  if (status == MagickFalse)
+    rotate_image=DestroyImage(rotate_image);
   return(rotate_image);
 }

diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index ab7d2be518a4a7d01ab2dc0beb3c6915a89f3c71..93410a10afdc835afa088cdcd39cc8764e6434b0 100644 (file)
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -2653,5 +2653,7 @@ MagickExport Image *StatisticImage(const Image *image,const StatisticType type,
   statistic_view=DestroyCacheView(statistic_view);
   image_view=DestroyCacheView(image_view);
   pixel_list=DestroyPixelListThreadSet(pixel_list);
+  if (status == MagickFalse)
+    statistic_image=DestroyImage(statistic_image);
   return(statistic_image);
 }

diff --git a/MagickCore/transform.c b/MagickCore/transform.c
index 2a6ba1f8151b13bc23009352e578d40a71d5ed91..2539892c99b0aae353ba7c201f46f5721dd92b41 100644 (file)
--- a/MagickCore/transform.c
+++ b/MagickCore/transform.c
@@ -302,6 +302,8 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info,
   chop_view=DestroyCacheView(chop_view);
   image_view=DestroyCacheView(image_view);
   chop_image->type=image->type;
+  if (status == MagickFalse)
+    chop_image=DestroyImage(chop_image);
   return(chop_image);
 }
 \f

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 809a4b8ed9e53457666a13816879c11d28796291..84e60195ed3751153e2678fa4274e70c2c616e2a 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision  "10131:10145M"
+#define MagickSVNRevision  "10227M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  8,0,0

diff --git a/Makefile.in b/Makefile.in
index c3a41e45634f71635557583e4d0b1ade04a11375..b3526f89cd81300d708a0c000c369cad7be9afb0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4885,7 +4885,9 @@ TESTS_EXTRA_DIST = \
   tests/sequence.miff \
        $(TESTS_TESTS)
 
-TESTS_CLEANFILES = 
+TESTS_CLEANFILES = \
+       tests/*_out.*
+
 @WITH_PERL_TRUE@PERLMAGICK = PerlMagick
 @WITH_PERL_TRUE@PERLMAKEMAKER = $(PERLMAGICK)/Makefile.PL
 @WITH_PERL_TRUE@PERLMAKEFILE = $(PERLMAGICK)/Makefile
@@ -10629,7 +10631,6 @@ uninstall-local-utilities:
          target=`echo "$$name" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
          rm -f $$target ; \
        done
-       tests/*_out.*
 
 # If source files missing, see if they can be obtained via VPATH
 perl-sources:

diff --git a/configure b/configure
index 42f8fbc243ac9e7f2e5e602591fe9eb017bc8bda..61250cd9aaa23a3c25fbd536146a56bd4448861f 100755 (executable)
--- a/configure
+++ b/configure
@@ -3649,7 +3649,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=10131:10145M
+MAGICK_SVN_REVISION=10227M