From f5d0f3e68f4d16a3bf4f74453926604f399ef697 Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 17 Jan 2012 03:20:33 +0000 Subject: [PATCH] --- MagickCore/effect.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/MagickCore/effect.c b/MagickCore/effect.c index 2a7060395..ee9aa61c0 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -245,7 +245,7 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, Create a set of kernels from maximum (radius,sigma) to minimum. */ width=GetOptimalKernelWidth2D(radius,sigma); - kernel=(double **) AcquireAlignedMemory((size_t) width,sizeof(*kernel)); + kernel=(double **) AcquireQuantumMemory((size_t) width,sizeof(*kernel)); if (kernel == (double **) NULL) { edge_image=DestroyImage(edge_image); @@ -255,7 +255,7 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, (void) ResetMagickMemory(kernel,0,(size_t) width*sizeof(*kernel)); for (i=0; i < (ssize_t) width; i+=2) { - kernel[i]=(double *) AcquireQuantumMemory((size_t) (width-i),(width-i)* + kernel[i]=(double *) AcquireAlignedMemory((size_t) (width-i),(width-i)* sizeof(**kernel)); if (kernel[i] == (double *) NULL) break; @@ -281,8 +281,8 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, if (i < (ssize_t) width) { for (i-=2; i >= 0; i-=2) - kernel[i]=(double *) RelinquishMagickMemory(kernel[i]); - kernel=(double **) RelinquishAlignedMemory(kernel); + kernel[i]=(double *) RelinquishAlignedMemory(kernel[i]); + kernel=(double **) RelinquishMagickMemory(kernel); edge_image=DestroyImage(edge_image); blur_image=DestroyImage(blur_image); ThrowImageException(ResourceLimitError,"MemoryAllocationFailed"); @@ -448,8 +448,8 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, image_view=DestroyCacheView(image_view); edge_image=DestroyImage(edge_image); for (i=0; i < (ssize_t) width; i+=2) - kernel[i]=(double *) RelinquishMagickMemory(kernel[i]); - kernel=(double **) RelinquishAlignedMemory(kernel); + kernel[i]=(double *) RelinquishAlignedMemory(kernel[i]); + kernel=(double **) RelinquishMagickMemory(kernel); if (status == MagickFalse) blur_image=DestroyImage(blur_image); return(blur_image); -- 2.40.0