(no commit message)

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 998e6bcd56ed74f63e5cbfb2f43969eda53b8245..fdb39351dc887cf8fb007954ecb46912de331d84 100644 (file)
--- 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 fbcbfdd348ad437335a6daf5f2d91a95d86868d7..768e615af6847e24972959fc758a289271afb77f 100644 (file)
--- 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 54494bbb8d20d0f77553d249c8768ec3b5b66bb0..9aab0b5e8320cb12a317c0bfe8f6034c3fefce2e 100644 (file)
--- 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 */