From da1231c183d0ec8198b5a6217fca9bd50a341974 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 24 Mar 2013 19:11:49 +0000 Subject: [PATCH] --- MagickCore/effect.c | 24 ++++++++++++++++++++---- MagickCore/version.h | 4 ++-- PerlMagick/quantum/quantum.xs | 3 +-- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/MagickCore/effect.c b/MagickCore/effect.c index 998e6bcd5..fdb39351d 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -828,7 +828,8 @@ MagickExport Image *BlurImage(const Image *image,const double radius, *kernel_info; Image - *blur_image; + *blur_image, + *morphology_image; assert(image != (const Image *) NULL); assert(image->signature == MagickSignature); @@ -836,12 +837,27 @@ MagickExport Image *BlurImage(const Image *image,const double radius, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickSignature); - (void) FormatLocaleString(geometry,MaxTextExtent, - "blur:%.20gx%.20g;blur:%.20gx%.20g+90",radius,sigma,radius,sigma); + (void) FormatLocaleString(geometry,MaxTextExtent,"blur:%.20gx%.20g",radius, + sigma); kernel_info=AcquireKernelInfo(geometry); if (kernel_info == (KernelInfo *) NULL) ThrowImageException(ResourceLimitError,"MemoryAllocationFailed"); - blur_image=MorphologyImage(image,ConvolveMorphology,1,kernel_info,exception); + morphology_image=MorphologyImage(image,ConvolveMorphology,1,kernel_info, + exception); + kernel_info=DestroyKernelInfo(kernel_info); + if (morphology_image == (Image *) NULL) + return((Image *) NULL); + (void) FormatLocaleString(geometry,MaxTextExtent,"blur:%.20gx%.20g+90",radius, + sigma); + kernel_info=AcquireKernelInfo(geometry); + if (kernel_info == (KernelInfo *) NULL) + { + morphology_image=DestroyImage(morphology_image); + ThrowImageException(ResourceLimitError,"MemoryAllocationFailed"); + } + blur_image=MorphologyImage(morphology_image,ConvolveMorphology,1,kernel_info, + exception); + morphology_image=DestroyImage(morphology_image); kernel_info=DestroyKernelInfo(kernel_info); return(blur_image); } diff --git a/MagickCore/version.h b/MagickCore/version.h index fbcbfdd34..768e615af 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2013 ImageMagick Studio LLC" -#define MagickSVNRevision "11453:11464M" +#define MagickSVNRevision "11453:11505M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 1,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 1 #define MagickLibMinInterface 1 -#define MagickReleaseDate "2013-03-22" +#define MagickReleaseDate "2013-03-24" #define MagickChangeDate "20121005" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "DPC HDRI OpenMP" diff --git a/PerlMagick/quantum/quantum.xs b/PerlMagick/quantum/quantum.xs index 54494bbb8..9aab0b5e8 100644 --- a/PerlMagick/quantum/quantum.xs +++ b/PerlMagick/quantum/quantum.xs @@ -7787,8 +7787,7 @@ Mogrify(ref,...) { if (attribute_flag[0] != 0) geometry_info.rho=argument_list[0].real_reference; - image=EdgeImage(image,geometry_info.rho,geometry_info.sigma, - exception); + image=EdgeImage(image,geometry_info.rho,exception); break; } case 11: /* Emboss */ -- 2.40.0