(no commit message)

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 8315ad1f441b4bd8da4aa28fe6ca560a99dbe251..b894a76585138af26c14dc6ba3adfdb4caf07f90 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -3935,7 +3935,7 @@ static MagickBooleanType MaskPixelCacheNexus(Image *image,NexusInfo *nexus_info,
 static inline void AllocatePixelCachePixels(CacheInfo *cache_info)
 {
   cache_info->mapped=MagickFalse;
-  cache_info->pixels=(Quantum *) AcquireMagickMemory((size_t)
+  cache_info->pixels=(Quantum *) AcquireAlignedMemory(1,(size_t)
     cache_info->length);
   if (cache_info->pixels == (Quantum *) NULL)
     {
@@ -4999,7 +4999,7 @@ static inline MagickBooleanType AcquireCacheNexusPixels(CacheInfo *cache_info,
   if (nexus_info->length != (MagickSizeType) ((size_t) nexus_info->length))
     return(MagickFalse);
   nexus_info->mapped=MagickFalse;
-  nexus_info->cache=(Quantum *) AcquireMagickMemory((size_t)
+  nexus_info->cache=(Quantum *) AcquireAlignedMemory(1,(size_t)
     nexus_info->length);
   if (nexus_info->cache == (Quantum *) NULL)
     {

diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index 5c0adcc6d8ac37ae9d8a0c58ec08a0c1ee9422bf..90180b6ba1f7d3404531fd5f4469d7e52e51116e 100644 (file)
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -312,7 +312,7 @@ static KernelInfo *ParseKernelArray(const char *kernel_string)
     }
 
   /* Read in the kernel values from rest of input string argument */
-  kernel->values=(double *) AcquireQuantumMemory(kernel->width,
+  kernel->values=(double *) AcquireAlignedMemory(kernel->width,
                         kernel->height*sizeof(double));
   if (kernel->values == (double *) NULL)
     return(DestroyKernelInfo(kernel));
@@ -1028,7 +1028,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
       {
         kernel->height = kernel->width = (size_t) 1;
         kernel->x = kernel->y = (ssize_t) 0;
-        kernel->values=(double *) AcquireQuantumMemory(1,sizeof(double));
+        kernel->values=(double *) AcquireAlignedMemory(1,sizeof(double));
         if (kernel->values == (double *) NULL)
           return(DestroyKernelInfo(kernel));
         kernel->maximum = kernel->values[0] = args->rho;
@@ -1051,7 +1051,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
           kernel->width = GetOptimalKernelWidth2D(args->rho,sigma2);
         kernel->height = kernel->width;
         kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2;
-        kernel->values=(double *) AcquireQuantumMemory(kernel->width,
+        kernel->values=(double *) AcquireAlignedMemory(kernel->width,
                               kernel->height*sizeof(double));
         if (kernel->values == (double *) NULL)
           return(DestroyKernelInfo(kernel));
@@ -1142,7 +1142,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
         kernel->x = (ssize_t) (kernel->width-1)/2;
         kernel->y = 0;
         kernel->negative_range = kernel->positive_range = 0.0;
-        kernel->values=(double *) AcquireQuantumMemory(kernel->width,
+        kernel->values=(double *) AcquireAlignedMemory(kernel->width,
                               kernel->height*sizeof(double));
         if (kernel->values == (double *) NULL)
           return(DestroyKernelInfo(kernel));
@@ -1226,7 +1226,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
         kernel->x = kernel->y = 0;
         kernel->height = 1;
         kernel->negative_range = kernel->positive_range = 0.0;
-        kernel->values=(double *) AcquireQuantumMemory(kernel->width,
+        kernel->values=(double *) AcquireAlignedMemory(kernel->width,
                               kernel->height*sizeof(double));
         if (kernel->values == (double *) NULL)
           return(DestroyKernelInfo(kernel));
@@ -1497,7 +1497,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
           kernel->width = kernel->height = ((size_t)args->rho)*2+1;
         kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2;
 
-        kernel->values=(double *) AcquireQuantumMemory(kernel->width,
+        kernel->values=(double *) AcquireAlignedMemory(kernel->width,
                               kernel->height*sizeof(double));
         if (kernel->values == (double *) NULL)
           return(DestroyKernelInfo(kernel));
@@ -1538,7 +1538,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
             kernel->y = (ssize_t) args->psi;
             scale = 1.0;
           }
-        kernel->values=(double *) AcquireQuantumMemory(kernel->width,
+        kernel->values=(double *) AcquireAlignedMemory(kernel->width,
                               kernel->height*sizeof(double));
         if (kernel->values == (double *) NULL)
           return(DestroyKernelInfo(kernel));
@@ -1559,7 +1559,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
             kernel->width = kernel->height = ((size_t)args->rho)*2+1;
           kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2;
 
-          kernel->values=(double *) AcquireQuantumMemory(kernel->width,
+          kernel->values=(double *) AcquireAlignedMemory(kernel->width,
                                 kernel->height*sizeof(double));
           if (kernel->values == (double *) NULL)
             return(DestroyKernelInfo(kernel));
@@ -1585,7 +1585,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
             kernel->width = kernel->height = (size_t)fabs(args->rho)*2+1;
           kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2;
 
-          kernel->values=(double *) AcquireQuantumMemory(kernel->width,
+          kernel->values=(double *) AcquireAlignedMemory(kernel->width,
                                 kernel->height*sizeof(double));
           if (kernel->values == (double *) NULL)
             return(DestroyKernelInfo(kernel));
@@ -1607,7 +1607,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
             kernel->width = kernel->height = ((size_t)args->rho)*2+1;
           kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2;
 
-          kernel->values=(double *) AcquireQuantumMemory(kernel->width,
+          kernel->values=(double *) AcquireAlignedMemory(kernel->width,
                                 kernel->height*sizeof(double));
           if (kernel->values == (double *) NULL)
             return(DestroyKernelInfo(kernel));
@@ -1628,7 +1628,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
             kernel->width = kernel->height = ((size_t)args->rho)*2+1;
           kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2;
 
-          kernel->values=(double *) AcquireQuantumMemory(kernel->width,
+          kernel->values=(double *) AcquireAlignedMemory(kernel->width,
                                 kernel->height*sizeof(double));
           if (kernel->values == (double *) NULL)
             return(DestroyKernelInfo(kernel));
@@ -1669,7 +1669,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
 
           kernel->height = kernel->width;
           kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2;
-          kernel->values=(double *) AcquireQuantumMemory(kernel->width,
+          kernel->values=(double *) AcquireAlignedMemory(kernel->width,
                                 kernel->height*sizeof(double));
           if (kernel->values == (double *) NULL)
             return(DestroyKernelInfo(kernel));
@@ -2039,7 +2039,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
             kernel->width = kernel->height = ((size_t)args->rho)*2+1;
           kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2;
 
-          kernel->values=(double *) AcquireQuantumMemory(kernel->width,
+          kernel->values=(double *) AcquireAlignedMemory(kernel->width,
                                 kernel->height*sizeof(double));
           if (kernel->values == (double *) NULL)
             return(DestroyKernelInfo(kernel));
@@ -2059,7 +2059,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
             kernel->width = kernel->height = ((size_t)args->rho)*2+1;
           kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2;
 
-          kernel->values=(double *) AcquireQuantumMemory(kernel->width,
+          kernel->values=(double *) AcquireAlignedMemory(kernel->width,
                                 kernel->height*sizeof(double));
           if (kernel->values == (double *) NULL)
             return(DestroyKernelInfo(kernel));
@@ -2079,7 +2079,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
           kernel->width = kernel->height = ((size_t)args->rho)*2+1;
         kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2;
 
-        kernel->values=(double *) AcquireQuantumMemory(kernel->width,
+        kernel->values=(double *) AcquireAlignedMemory(kernel->width,
                               kernel->height*sizeof(double));
         if (kernel->values == (double *) NULL)
           return(DestroyKernelInfo(kernel));
@@ -2104,7 +2104,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
           kernel->width = kernel->height = ((size_t)args->rho)*2+1;
         kernel->x = kernel->y = (ssize_t) (kernel->width-1)/2;
 
-        kernel->values=(double *) AcquireQuantumMemory(kernel->width,
+        kernel->values=(double *) AcquireAlignedMemory(kernel->width,
                               kernel->height*sizeof(double));
         if (kernel->values == (double *) NULL)
           return(DestroyKernelInfo(kernel));
@@ -2169,7 +2169,7 @@ MagickExport KernelInfo *CloneKernelInfo(const KernelInfo *kernel)
   *new_kernel=(*kernel); /* copy values in structure */
 
   /* replace the values with a copy of the values */
-  new_kernel->values=(double *) AcquireQuantumMemory(kernel->width,
+  new_kernel->values=(double *) AcquireAlignedMemory(kernel->width,
     kernel->height*sizeof(double));
   if (new_kernel->values == (double *) NULL)
     return(DestroyKernelInfo(new_kernel));