From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 31 May 2015 17:11:33 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~975
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99ed6690cd1ac40875fdf40d362cbd559dcdade1;p=imagemagick

---

diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h
index b7ddb6727..8b54f440e 100644
--- a/MagickCore/cache-private.h
+++ b/MagickCore/cache-private.h
@@ -237,11 +237,11 @@ extern MagickPrivate const Quantum
   *GetVirtualPixelsFromNexus(const Image *,const VirtualPixelMethod,
     const ssize_t,const ssize_t,const size_t,const size_t,NexusInfo *,
     ExceptionInfo *) magick_hot_spot,
-  *GetVirtualPixelsNexus(const Cache,NexusInfo *);
+  *GetVirtualPixelsNexus(const Cache,NexusInfo *restrict);
 
 extern MagickPrivate const void
   *AcquirePixelCachePixels(const Image *,MagickSizeType *,ExceptionInfo *),
-  *GetVirtualMetacontentFromNexus(const Cache,NexusInfo *);
+  *GetVirtualMetacontentFromNexus(const Cache,NexusInfo *restrict);
 
 extern MagickPrivate MagickBooleanType
   CacheComponentGenesis(void),
@@ -250,7 +250,7 @@ extern MagickPrivate MagickBooleanType
   SyncImagePixelCache(Image *,ExceptionInfo *);
 
 extern MagickPrivate MagickSizeType
-  GetPixelCacheNexusExtent(const Cache,NexusInfo *);
+  GetPixelCacheNexusExtent(const Cache,NexusInfo *restrict);
 
 extern MagickPrivate NexusInfo
   **AcquirePixelCacheNexus(const size_t),
diff --git a/MagickCore/cache-view.h b/MagickCore/cache-view.h
index 1d2da4873..307c49b58 100644
--- a/MagickCore/cache-view.h
+++ b/MagickCore/cache-view.h
@@ -72,12 +72,12 @@ extern MagickExport const void
   *GetCacheViewVirtualMetacontent(const CacheView *);
 
 extern MagickExport MagickBooleanType
-  GetOneCacheViewAuthenticPixel(const CacheView *restrict,const ssize_t,
-    const ssize_t,Quantum *restrict,ExceptionInfo *),
+  GetOneCacheViewAuthenticPixel(const CacheView *,const ssize_t,const ssize_t,
+    Quantum *,ExceptionInfo *),
   GetOneCacheViewVirtualMethodPixel(const CacheView *,const VirtualPixelMethod,
     const ssize_t,const ssize_t,Quantum *,ExceptionInfo *),
-  GetOneCacheViewVirtualPixel(const CacheView *restrict,const ssize_t,
-    const ssize_t,Quantum *restrict,ExceptionInfo *),
+  GetOneCacheViewVirtualPixel(const CacheView *,const ssize_t,const ssize_t,
+    Quantum *,ExceptionInfo *),
   GetOneCacheViewVirtualPixelInfo(const CacheView *,const ssize_t,const ssize_t,
     PixelInfo *,ExceptionInfo *),
   SetCacheViewStorageClass(CacheView *,const ClassType,ExceptionInfo *),
diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 5c467d861..bd37fae27 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -124,7 +124,8 @@ static MagickBooleanType
   ReadPixelCacheMetacontent(CacheInfo *restrict,NexusInfo *restrict,
     ExceptionInfo *),
   SyncAuthenticPixelsCache(Image *,ExceptionInfo *),
-  WritePixelCachePixels(CacheInfo *,NexusInfo *restrict,ExceptionInfo *),
+  WritePixelCachePixels(CacheInfo *restrict,NexusInfo *restrict,
+    ExceptionInfo *),
   WritePixelCacheMetacontent(CacheInfo *,NexusInfo *restrict,ExceptionInfo *);
 
 static Quantum