...

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index fc67bb46a7449c13dd70af7547ca66a51bafd97d..366ea0ccf04c446e0d55edab538965eb75ad9b99 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -135,9 +135,10 @@ static Quantum
     const size_t,ExceptionInfo *),
   *QueueAuthenticPixelsCache(Image *,const ssize_t,const ssize_t,const size_t,
     const size_t,ExceptionInfo *),
-  *SetPixelCacheNexusPixels(const CacheInfo *,const MapMode,const ssize_t,
-    const ssize_t,const size_t,const size_t,const MagickBooleanType,
-    NexusInfo *magick_restrict,ExceptionInfo *) magick_hot_spot;
+  *SetPixelCacheNexusPixels(const CacheInfo *magick_restrict,const MapMode,
+    const ssize_t,const ssize_t,const size_t,const size_t,
+    const MagickBooleanType,NexusInfo *magick_restrict,ExceptionInfo *)
+    magick_hot_spot;
 
 #if defined(MAGICKCORE_OPENCL_SUPPORT)
 static void
@@ -4913,10 +4914,10 @@ MagickPrivate void SetPixelCacheMethods(Cache cache,CacheMethods *cache_methods)
 %
 %  The format of the SetPixelCacheNexusPixels() method is:
 %
-%      Quantum SetPixelCacheNexusPixels(const CacheInfo *cache_info,
-%        const MapMode mode,const ssize_t x,const ssize_t y,const size_t width,
-%        const size_t height,const MagickBooleanType buffered,
-%        NexusInfo *magick_restrict nexus_info,ExceptionInfo *exception)
+%      Quantum SetPixelCacheNexusPixels(
+%        const CacheInfo *magick_restrict cache_info,const MapMode mode,
+%        const ssize_t x,const ssize_t y,const size_t width,const size_t height,
+%        const MagickBooleanType buffered,NexusInfo *magick_restrict nexus_info,$        ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -4985,9 +4986,10 @@ static inline void PrefetchPixelCacheNexusPixels(const NexusInfo *nexus_info,
   MagickCachePrefetch((unsigned char *) nexus_info->pixels+CACHE_LINE_SIZE,1,1);
 }
 
-static Quantum *SetPixelCacheNexusPixels(const CacheInfo *cache_info,
-  const MapMode mode,const ssize_t x,const ssize_t y,const size_t width,
-  const size_t height,const MagickBooleanType buffered,NexusInfo *nexus_info,
+static Quantum *SetPixelCacheNexusPixels(
+  const CacheInfo *magick_restrict cache_info,const MapMode mode,
+  const ssize_t x,const ssize_t y,const size_t width,const size_t height,
+  const MagickBooleanType buffered,NexusInfo *nexus_info,
   ExceptionInfo *exception)
 {
   MagickBooleanType

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index d5fe7a60b2d21283f09f7666d88e3a9ce5e34e4b..9b2f8760730c9b7964d03c5aa74b8aefe524faa2 100644 (file)
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -4398,10 +4398,10 @@ MagickExport void InitializePixelChannelMap(Image *image)
 %
 %  The format of the InterpolatePixelChannel method is:
 %
-%      MagickBooleanType InterpolatePixelChannel(const Image *image,
-%        const CacheView *image_view,const PixelChannel channel,
-%        const PixelInterpolateMethod method,const double x,const double y,
-%        double *pixel,ExceptionInfo *exception)
+%      MagickBooleanType InterpolatePixelChannel(
+%        const Image *magick_restrict image,const CacheView *image_view,
+%        const PixelChannel channel,const PixelInterpolateMethod method,
+%        const double x,const double y,double *pixel,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -4483,10 +4483,10 @@ static inline ssize_t NearestNeighbor(const double x)
 }
 */
 
-MagickExport MagickBooleanType InterpolatePixelChannel(const Image *image,
-  const CacheView_ *image_view,const PixelChannel channel,
-  const PixelInterpolateMethod method,const double x,const double y,
-  double *pixel,ExceptionInfo *exception)
+MagickExport MagickBooleanType InterpolatePixelChannel(
+  const Image *magick_restrict image,const CacheView_ *image_view,
+  const PixelChannel channel,const PixelInterpolateMethod method,
+  const double x,const double y,double *pixel,ExceptionInfo *exception)
 {
   double
     alpha[16],
@@ -4503,7 +4503,7 @@ MagickExport MagickBooleanType InterpolatePixelChannel(const Image *image,
     traits;
 
   register const Quantum
-    *p;
+    *magick_restrict p;
 
   register ssize_t
     i;
@@ -4885,8 +4885,9 @@ MagickExport MagickBooleanType InterpolatePixelChannel(const Image *image,
 %
 %  The format of the InterpolatePixelChannels method is:
 %
-%      MagickBooleanType InterpolatePixelChannels(const Image *source,
-%        const CacheView *source_view,const Image *destination,
+%      MagickBooleanType InterpolatePixelChannels(
+%        const Image *magick_restrict source,const CacheView *source_view,
+%        const Image *magick_restrict destination,
 %        const PixelInterpolateMethod method,const double x,const double y,
 %        Quantum *pixel,ExceptionInfo *exception)
 %
@@ -4907,10 +4908,10 @@ MagickExport MagickBooleanType InterpolatePixelChannel(const Image *image,
 %    o exception: return any errors or warnings in this structure.
 %
 */
-MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source,
-  const CacheView_ *source_view,const Image *destination,
-  const PixelInterpolateMethod method,const double x,const double y,
-  Quantum *pixel,ExceptionInfo *exception)
+MagickExport MagickBooleanType InterpolatePixelChannels(
+  const Image *magick_restrict source,const CacheView_ *source_view,
+  const Image *magick_restrict destination,const PixelInterpolateMethod method,
+  const double x,const double y,Quantum *pixel,ExceptionInfo *exception)
 {
   MagickBooleanType
     status;
@@ -4921,7 +4922,7 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source,
     pixels[16];
 
   register const Quantum
-    *p;
+    *magick_restrict p;
 
   register ssize_t
     i;

diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h
index 2069d2ad90044007b5351941e7e85047b7c26879..721e390c9e65d0a449b7e986a3014a49ba5010ed 100644 (file)
--- a/MagickCore/pixel.h
+++ b/MagickCore/pixel.h
@@ -220,12 +220,12 @@ extern MagickExport MagickBooleanType
     const size_t,const char *,const StorageType,void *,ExceptionInfo *),
   ImportImagePixels(Image *,const ssize_t,const ssize_t,const size_t,
     const size_t,const char *,const StorageType,const void *,ExceptionInfo *),
-  InterpolatePixelChannel(const Image *,const CacheView_ *,
+  InterpolatePixelChannel(const Image *magick_restrict,const CacheView_ *,
     const PixelChannel,const PixelInterpolateMethod,const double,const double,
     double *,ExceptionInfo *),
-  InterpolatePixelChannels(const Image *,const CacheView_ *,const Image *,
-    const PixelInterpolateMethod,const double,const double,Quantum *,
-    ExceptionInfo *),
+  InterpolatePixelChannels(const Image *magick_restrict,const CacheView_ *,
+    const Image * magick_restrict,const PixelInterpolateMethod,const double,
+    const double,Quantum *,ExceptionInfo *),
   InterpolatePixelInfo(const Image *,const CacheView_ *,
     const PixelInterpolateMethod,const double,const double,PixelInfo *,
     ExceptionInfo *),