From: cristy Date: Fri, 14 Dec 2012 01:20:55 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4595 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c2f48d0fbbad5757296fca9324fa14033f56632;p=imagemagick --- diff --git a/MagickCore/channel.c b/MagickCore/channel.c index 6d5658af0..24a011742 100644 --- 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); } @@ -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); } diff --git a/MagickCore/compare.c b/MagickCore/compare.c index 816e76d97..49e411b71 100644 --- 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 0cb9a5fc9..fe99ef616 100644 --- 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); } diff --git a/MagickCore/distort.c b/MagickCore/distort.c index e3162d75c..2a81a3261 100644 --- 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); } diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index 00dada13d..3068cbfa3 100644 --- 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); } @@ -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 e0dfb1936..8f9135d7d 100644 --- 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); } diff --git a/MagickCore/shear.c b/MagickCore/shear.c index 27a0c8040..c2ddd7a1b 100644 --- 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); } @@ -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 ab7d2be51..93410a10a 100644 --- 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 2a6ba1f81..2539892c9 100644 --- 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); } diff --git a/MagickCore/version.h b/MagickCore/version.h index 809a4b8ed..84e60195e 100644 --- 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 c3a41e456..b3526f89c 100644 --- 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 42f8fbc24..61250cd9a 100755 --- 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