Placed the accelerated methods in alphabetic order.

diff --git a/MagickCore/accelerate-private.h b/MagickCore/accelerate-private.h
index ce5297e608cb720459fde725a2bf7b11ad45f281..022f18c20d5f95308852a0217e6680ca04d9bc83 100644 (file)
--- a/MagickCore/accelerate-private.h
+++ b/MagickCore/accelerate-private.h
@@ -196,6 +196,20 @@ const char* accelerateKernels =
      } MagickFunction;
   )
 
+  STRINGIFY(
+    typedef enum
+    {
+      UndefinedNoise,
+      UniformNoise,
+      GaussianNoise,
+      MultiplicativeGaussianNoise,
+      ImpulseNoise,
+      LaplacianNoise,
+      PoissonNoise,
+      RandomNoise
+    } NoiseType;
+  )
+
   STRINGIFY(
     typedef enum
   {
@@ -606,18 +620,6 @@ uint MWC64X_NextUint(mwc64x_state_t *s)
 // End of MWC64X excerpt
 //
 
-  typedef enum
-  {
-    UndefinedNoise,
-    UniformNoise,
-    GaussianNoise,
-    MultiplicativeGaussianNoise,
-    ImpulseNoise,
-    LaplacianNoise,
-    PoissonNoise,
-    RandomNoise
-  } NoiseType;
-
   float mwcReadPseudoRandomValue(mwc64x_state_t* rng) {
        return (1.0f * MWC64X_NextUint(rng)) / (float)(0xffffffff);     // normalized to 1.0
   }
@@ -1531,6 +1533,17 @@ uint MWC64X_NextUint(mwc64x_state_t *s)
       }
     )
 
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%    C o n v o l v e                                                          %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+*/
 
   STRINGIFY(
     __kernel 
@@ -1655,18 +1668,6 @@ uint MWC64X_NextUint(mwc64x_state_t *s)
     }
   )
 
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%    C o n v o l v e                                                          %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-*/
-
   STRINGIFY(
     __kernel 
     void Convolve(const __global CLPixelType *input, __global CLPixelType *output,

diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c
index aca16528e9823e7ee7cbb9cfb0662e75c9e6aca9..e076db8eec8d8e88e5c2d0209a37631c98f2d33d 100644 (file)
--- a/MagickCore/accelerate.c
+++ b/MagickCore/accelerate.c
@@ -7309,7 +7309,7 @@ MagickExport MagickBooleanType AccelerateContrastStretchImage(
   return(MagickFalse);
 }
 
-MagickExport Image *AccelerateConvolveImageChannel(
+MagickExport Image *AccelerateConvolveImage(
   const Image *magick_unused(image),const ChannelType magick_unused(channel),
   const KernelInfo *magick_unused(kernel),
   ExceptionInfo *magick_unused(exception))