(no commit message)

diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c
index bfb4b5d8c3dacb453fe8831430c9b7a2280e73d3..049b11d0e8517aa6043465cb0e5e8e096a4aab05 100644 (file)
--- a/MagickCore/delegate.c
+++ b/MagickCore/delegate.c
@@ -96,7 +96,7 @@ static const char
     "  <delegate decode=\"https\" command=\"&quot;wget&quot; -q -O &quot;%o&quot; &quot;https:%M&quot;\"/>"
     "  <delegate decode=\"ilbm\" command=\"&quot;ilbmtoppm&quot; &quot;%i&quot; &gt; &quot;%o&quot;\"/>"
     "  <delegate decode=\"man\" command=\"&quot;groff&quot; -man -Tps &quot;%i&quot; &gt; &quot;%o&quot;\"/>"
-    "  <delegate decode=\"mpeg:decode\" stealth=\"True\" command=\"&quot;ffmpeg&quot; --i &quot;%i&quot; -vcodec pam -an -f rawvideo -y &quot;%u0.pam&quot; 2;&gt; &quot;%Z&quot;\"/>"
+    "  <delegate decode=\"mpeg:decode\" stealth=\"True\" command=\"&quot;ffmpeg&quot; -i &quot;%i&quot; -vcodec pam -an -f rawvideo -y &quot;%u0.pam&quot; 2;&gt; &quot;%Z&quot;\"/>"
     "  <delegate decode=\"null\" encode=\"mpeg:encode\" stealth=\"True\" command=\"&quot;ffmpeg&quot; &quot;%M%%d.jpg&quot; &quot;%u.%m&quot; 2;&gt; &quot;%Z&quot;\"/>"
     "  <delegate decode=\"pcl:color\" stealth=\"True\" command=\"&quot;pcl6&quot; -dQUIET -dSAFER -dPARANOIDSAFE -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=0 &quot;-sDEVICE=ppmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;\"/>"
     "  <delegate decode=\"pcl:cmyk\" stealth=\"True\" command=\"&quot;pcl6&quot; -dQUIET -dSAFER -dPARANOIDSAFE -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=0 &quot;-sDEVICE=bmpsep8&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;\"/>"

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 65d1528a2d5a2cfb45e231b428bf67d9cccca294..98ea3197aa32d82e5fabd459461d834e6d552491 100644 (file)
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -1802,7 +1802,7 @@ MagickExport Image *EdgeImage(const Image *image,const double radius,
     ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
   kernel_info->width=width;
   kernel_info->height=width;
-  kernel_info->values=(double *) AcquireQuantumMemory(kernel_info->width,
+  kernel_info->values=(double *) AcquireAlignedMemory(kernel_info->width,
     kernel_info->width*sizeof(*kernel_info->values));
   if (kernel_info->values == (double *) NULL)
     {
@@ -1892,7 +1892,7 @@ MagickExport Image *EmbossImage(const Image *image,const double radius,
     ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
   kernel_info->width=width;
   kernel_info->height=width;
-  kernel_info->values=(double *) AcquireQuantumMemory(kernel_info->width,
+  kernel_info->values=(double *) AcquireAlignedMemory(kernel_info->width,
     kernel_info->width*sizeof(*kernel_info->values));
   if (kernel_info->values == (double *) NULL)
     {
@@ -1993,7 +1993,7 @@ MagickExport Image *GaussianBlurImage(const Image *image,const double radius,
   kernel_info->height=width;
   kernel_info->bias=bias;
   kernel_info->signature=MagickSignature;
-  kernel_info->values=(double *) AcquireQuantumMemory(kernel_info->width,
+  kernel_info->values=(double *) AcquireAlignedMemory(kernel_info->width,
     kernel_info->width*sizeof(*kernel_info->values));
   if (kernel_info->values == (double *) NULL)
     {
@@ -3677,7 +3677,7 @@ MagickExport Image *SharpenImage(const Image *image,const double radius,
   kernel_info->height=width;
   kernel_info->bias=bias;
   kernel_info->signature=MagickSignature;
-  kernel_info->values=(double *) AcquireQuantumMemory(kernel_info->width,
+  kernel_info->values=(double *) AcquireAlignedMemory(kernel_info->width,
     kernel_info->width*sizeof(*kernel_info->values));
   if (kernel_info->values == (double *) NULL)
     {

diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index 9d78d497afa868462d38e58a08e6e6c53291c5b4..414c6c2e610542840ea2ba6cd45e2363aa1d8e7c 100644 (file)
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -314,15 +314,13 @@ 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->height*sizeof(double));
+  kernel->values=(double *) AcquireAlignedMemory(kernel->width,
+    kernel->height*sizeof(*kernel->values));
   if (kernel->values == (double *) NULL)
     return(DestroyKernelInfo(kernel));
-
   kernel->minimum = +MagickHuge;
   kernel->maximum = -MagickHuge;
   kernel->negative_range = kernel->positive_range = 0.0;
-
   for (i=0; (i < (ssize_t) (kernel->width*kernel->height)) && (p < end); i++)
   {
     GetMagickToken(p,&p,token);
@@ -1030,7 +1028,8 @@ 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(*kernel->values));
         if (kernel->values == (double *) NULL)
           return(DestroyKernelInfo(kernel));
         kernel->maximum = kernel->values[0] = args->rho;
@@ -1053,8 +1052,8 @@ 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->height*sizeof(double));
+        kernel->values=(double *) AcquireAlignedMemory(kernel->width,
+          kernel->height*sizeof(*kernel->values));
         if (kernel->values == (double *) NULL)
           return(DestroyKernelInfo(kernel));
 
@@ -1144,8 +1143,8 @@ 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->height*sizeof(double));
+        kernel->values=(double *) AcquireAlignedMemory(kernel->width,
+          kernel->height*sizeof(*kernel->values));
         if (kernel->values == (double *) NULL)
           return(DestroyKernelInfo(kernel));
 
@@ -1228,8 +1227,8 @@ 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->height*sizeof(double));
+        kernel->values=(double *) AcquireAlignedMemory(kernel->width,
+          kernel->height*sizeof(*kernel->values));
         if (kernel->values == (double *) NULL)
           return(DestroyKernelInfo(kernel));
 
@@ -1499,8 +1498,8 @@ 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->height*sizeof(double));
+        kernel->values=(double *) AcquireAlignedMemory(kernel->width,
+          kernel->height*sizeof(*kernel->values));
         if (kernel->values == (double *) NULL)
           return(DestroyKernelInfo(kernel));
 
@@ -1540,8 +1539,8 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
             kernel->y = (ssize_t) args->psi;
             scale = 1.0;
           }
-        kernel->values=(double *) AcquireQuantumMemory(kernel->width,
-                              kernel->height*sizeof(double));
+        kernel->values=(double *) AcquireAlignedMemory(kernel->width,
+          kernel->height*sizeof(*kernel->values));
         if (kernel->values == (double *) NULL)
           return(DestroyKernelInfo(kernel));
 
@@ -1561,8 +1560,8 @@ 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->height*sizeof(double));
+          kernel->values=(double *) AcquireAlignedMemory(kernel->width,
+            kernel->height*sizeof(*kernel->values));
           if (kernel->values == (double *) NULL)
             return(DestroyKernelInfo(kernel));
 
@@ -1587,8 +1586,8 @@ 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->height*sizeof(double));
+          kernel->values=(double *) AcquireAlignedMemory(kernel->width,
+            kernel->height*sizeof(*kernel->values));
           if (kernel->values == (double *) NULL)
             return(DestroyKernelInfo(kernel));
 
@@ -1609,8 +1608,8 @@ 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->height*sizeof(double));
+          kernel->values=(double *) AcquireAlignedMemory(kernel->width,
+            kernel->height*sizeof(*kernel->values));
           if (kernel->values == (double *) NULL)
             return(DestroyKernelInfo(kernel));
 
@@ -1630,8 +1629,8 @@ 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->height*sizeof(double));
+          kernel->values=(double *) AcquireAlignedMemory(kernel->width,
+            kernel->height*sizeof(*kernel->values));
           if (kernel->values == (double *) NULL)
             return(DestroyKernelInfo(kernel));
 
@@ -1671,8 +1670,8 @@ 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->height*sizeof(double));
+          kernel->values=(double *) AcquireAlignedMemory(kernel->width,
+            kernel->height*sizeof(*kernel->values));
           if (kernel->values == (double *) NULL)
             return(DestroyKernelInfo(kernel));
 
@@ -2041,8 +2040,8 @@ 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->height*sizeof(double));
+          kernel->values=(double *) AcquireAlignedMemory(kernel->width,
+            kernel->height*sizeof(*kernel->values));
           if (kernel->values == (double *) NULL)
             return(DestroyKernelInfo(kernel));
 
@@ -2061,8 +2060,8 @@ 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->height*sizeof(double));
+          kernel->values=(double *) AcquireAlignedMemory(kernel->width,
+            kernel->height*sizeof(*kernel->values));
           if (kernel->values == (double *) NULL)
             return(DestroyKernelInfo(kernel));
 
@@ -2081,8 +2080,8 @@ 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->height*sizeof(double));
+        kernel->values=(double *) AcquireAlignedMemory(kernel->width,
+          kernel->height*sizeof(*kernel->values));
         if (kernel->values == (double *) NULL)
           return(DestroyKernelInfo(kernel));
 
@@ -2106,8 +2105,8 @@ 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->height*sizeof(double));
+        kernel->values=(double *) AcquireAlignedMemory(kernel->width,
+          kernel->height*sizeof(*kernel->values));
         if (kernel->values == (double *) NULL)
           return(DestroyKernelInfo(kernel));
 
@@ -2145,7 +2144,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
 %
 %  CloneKernelInfo() creates a new clone of the given Kernel List so that its
 %  can be modified without effecting the original.  The cloned kernel should
-%  be destroyed using DestoryKernelInfo() when no longer needed.
+%  be destroyed using DestroyKernelInfo() when no longer needed.
 %
 %  The format of the CloneKernelInfo method is:
 %
@@ -2171,8 +2170,8 @@ 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,
-    kernel->height*sizeof(double));
+  new_kernel->values=(double *) AcquireAlignedMemory(kernel->width,
+    kernel->height*sizeof(*kernel->values));
   if (new_kernel->values == (double *) NULL)
     return(DestroyKernelInfo(new_kernel));
   for (i=0; i < (ssize_t) (kernel->width*kernel->height); i++)
@@ -2214,12 +2213,10 @@ MagickExport KernelInfo *CloneKernelInfo(const KernelInfo *kernel)
 MagickExport KernelInfo *DestroyKernelInfo(KernelInfo *kernel)
 {
   assert(kernel != (KernelInfo *) NULL);
-
   if ( kernel->next != (KernelInfo *) NULL )
-    kernel->next = DestroyKernelInfo(kernel->next);
-
-  kernel->values = (double *)RelinquishMagickMemory(kernel->values);
-  kernel = (KernelInfo *) RelinquishMagickMemory(kernel);
+    kernel->next=DestroyKernelInfo(kernel->next);
+  kernel->values=(double *) RelinquishAlignedMemory(kernel->values);
+  kernel=(KernelInfo *) RelinquishMagickMemory(kernel);
   return(kernel);
 }
 \f

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index fa3a7e15df31ee499a9a095f32ab91e4f07c25f6..42bc53a462e94013ece6d7f505b0a9ca2d9b8d4e 100644 (file)
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -9182,7 +9182,7 @@ Mogrify(ref,...)
               order=(size_t) sqrt(av_len(av)+1);
               kernel->width=order;
               kernel->height=order;
-              kernel->values=(double *) AcquireQuantumMemory(order,order*
+              kernel->values=(double *) AcquireAlignedMemory(order,order*
                 sizeof(*kernel->values));
               if (kernel->values == (double *) NULL)
                 {