Changeset 6489

Timestamp:

01/16/12 22:20:33 (16 months ago)

Author:

cristy

Message:

 

File:

• ImageMagick/trunk/MagickCore/effect.c (modified) (4 diffs)

ImageMagick/trunk/MagickCore/effect.c

@@ -246 +246 @@
   */
   width=GetOptimalKernelWidth2D(radius,sigma);
-  kernel=(double **) AcquireAlignedMemory((size_t) width,sizeof(*kernel));
+  kernel=(double **) AcquireQuantumMemory((size_t) width,sizeof(*kernel));
   if (kernel == (double **) NULL)
     {
@@ -256 +256 @@
   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)
@@ -282 +282 @@
     {
       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);
@@ -449 +449 @@
   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);