From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 19 Apr 2013 16:12:56 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~3838
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d1254d929614c9b0cd5b3d7f8bbe051eb3e99d6;p=imagemagick

---

diff --git a/MagickCore/compress.c b/MagickCore/compress.c
index b33d14825..f639a050e 100644
--- a/MagickCore/compress.c
+++ b/MagickCore/compress.c
@@ -905,7 +905,7 @@ MagickExport MagickBooleanType HuffmanEncodeImage(const ImageInfo *image_info,
 %  The format of the LZWEncodeImage method is:
 %
 %      MagickBooleanType LZWEncodeImage(Image *image,const size_t length,
-%        unsigned char *pixels,ExceptionInfo *exception)
+%        unsigned char *restrict pixels,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -920,7 +920,7 @@ MagickExport MagickBooleanType HuffmanEncodeImage(const ImageInfo *image_info,
 %
 */
 MagickExport MagickBooleanType LZWEncodeImage(Image *image,const size_t length,
-  unsigned char *pixels,ExceptionInfo *exception)
+  unsigned char *restrict pixels,ExceptionInfo *exception)
 {
 #define LZWClr  256UL  /* Clear Table Marker */
 #define LZWEod  257UL  /* End of Data marker */
@@ -1069,7 +1069,7 @@ MagickExport MagickBooleanType LZWEncodeImage(Image *image,const size_t length,
 %  The format of the PackbitsEncodeImage method is:
 %
 %      MagickBooleanType PackbitsEncodeImage(Image *image,const size_t length,
-%        unsigned char *pixels)
+%        unsigned char *restrict pixels)
 %
 %  A description of each parameter follows:
 %
@@ -1082,7 +1082,7 @@ MagickExport MagickBooleanType LZWEncodeImage(Image *image,const size_t length,
 %
 */
 MagickExport MagickBooleanType PackbitsEncodeImage(Image *image,
-  const size_t length,unsigned char *pixels,ExceptionInfo *exception)
+  const size_t length,unsigned char *restrict pixels,ExceptionInfo *exception)
 {
   int
     count;
@@ -1204,7 +1204,7 @@ MagickExport MagickBooleanType PackbitsEncodeImage(Image *image,
 %  The format of the ZLIBEncodeImage method is:
 %
 %      MagickBooleanType ZLIBEncodeImage(Image *image,const size_t length,
-%        unsigned char *pixels,ExceptionInfo *exception)
+%        unsigned char *restrict pixels,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -1234,7 +1234,7 @@ static void RelinquishZIPMemory(voidpf context,voidpf memory)
 }
 
 MagickExport MagickBooleanType ZLIBEncodeImage(Image *image,const size_t length,
-  unsigned char *pixels,ExceptionInfo *exception)
+  unsigned char *restrict pixels,ExceptionInfo *exception)
 {
   int
     status;
diff --git a/MagickCore/distribute-cache.c b/MagickCore/distribute-cache.c
index 2a8206194..30061c3ce 100644
--- a/MagickCore/distribute-cache.c
+++ b/MagickCore/distribute-cache.c
@@ -1205,7 +1205,7 @@ MagickPrivate MagickOffsetType ReadDistributePixelCacheMetacontent(
 %
 %      MagickOffsetType ReadDistributePixelCachePixels(
 %        DistributeCacheInfo *server_info,const RectangleInfo *region,
-%        const MagickSizeType length,unsigned char *pixels)
+%        const MagickSizeType length,unsigned char *restrict pixels)
 %
 %  A description of each parameter follows:
 %
@@ -1222,7 +1222,7 @@ MagickPrivate MagickOffsetType ReadDistributePixelCacheMetacontent(
 */
 MagickPrivate MagickOffsetType ReadDistributePixelCachePixels(
   DistributeCacheInfo *server_info,const RectangleInfo *region,
-  const MagickSizeType length,unsigned char *pixels)
+  const MagickSizeType length,unsigned char *restrict pixels)
 {
   MagickOffsetType
     count;
@@ -1412,7 +1412,7 @@ MagickPrivate MagickOffsetType WriteDistributePixelCacheMetacontent(
 %
 %      MagickBooleanType WriteDistributePixelCachePixels(
 %        DistributeCacheInfo *server_info,const RectangleInfo *region,
-%        const MagickSizeType length,const unsigned char *pixels)
+%        const MagickSizeType length,const unsigned char *restrict pixels)
 %
 %  A description of each parameter follows:
 %
@@ -1429,7 +1429,7 @@ MagickPrivate MagickOffsetType WriteDistributePixelCacheMetacontent(
 */
 MagickPrivate MagickOffsetType WriteDistributePixelCachePixels(
   DistributeCacheInfo *server_info,const RectangleInfo *region,
-  const MagickSizeType length,const unsigned char *pixels)
+  const MagickSizeType length,const unsigned char *restrict pixels)
 {
   MagickOffsetType
     count;
diff --git a/MagickCore/quantum-export.c b/MagickCore/quantum-export.c
index 8bd8c76a9..d59f146d1 100644
--- a/MagickCore/quantum-export.c
+++ b/MagickCore/quantum-export.c
@@ -91,7 +91,7 @@
 %
 %      size_t ExportQuantumPixels(const Image *image,CacheView *image_view,
 %        QuantumInfo *quantum_info,const QuantumType quantum_type,
-%        unsigned char *pixels,ExceptionInfo *exception)
+%        unsigned char *restrict pixels,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -111,7 +111,7 @@
 */
 
 static inline unsigned char *PopDoublePixel(QuantumInfo *quantum_info,
-  const double pixel,unsigned char *pixels)
+  const double pixel,unsigned char *restrict pixels)
 {
   double
     *p;
@@ -145,7 +145,7 @@ static inline unsigned char *PopDoublePixel(QuantumInfo *quantum_info,
 }
 
 static inline unsigned char *PopFloatPixel(QuantumInfo *quantum_info,
-  const float pixel,unsigned char *pixels)
+  const float pixel,unsigned char *restrict pixels)
 {
   float
     *p;
@@ -172,7 +172,7 @@ static inline unsigned char *PopFloatPixel(QuantumInfo *quantum_info,
 }
 
 static inline unsigned char *PopQuantumPixel(QuantumInfo *quantum_info,
-  const QuantumAny pixel,unsigned char *pixels)
+  const QuantumAny pixel,unsigned char *restrict pixels)
 {
   register ssize_t
     i;
@@ -203,7 +203,7 @@ static inline unsigned char *PopQuantumPixel(QuantumInfo *quantum_info,
 }
 
 static inline unsigned char *PopQuantumLongPixel(QuantumInfo *quantum_info,
-  const size_t pixel,unsigned char *pixels)
+  const size_t pixel,unsigned char *restrict pixels)
 {
   register ssize_t
     i;
@@ -3183,7 +3183,8 @@ static void ExportRGBAQuantum(const Image *image,QuantumInfo *quantum_info,
 
 MagickExport size_t ExportQuantumPixels(const Image *image,
   CacheView *image_view,QuantumInfo *quantum_info,
-  const QuantumType quantum_type,unsigned char *pixels,ExceptionInfo *exception)
+  const QuantumType quantum_type,unsigned char *restrict pixels,
+  ExceptionInfo *exception)
 {
   MagickSizeType
     number_pixels;
diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c
index 576de36d4..f28039745 100644
--- a/MagickCore/quantum-import.c
+++ b/MagickCore/quantum-import.c
@@ -92,7 +92,7 @@
 %
 %      size_t ImportQuantumPixels(const Image *image,CacheView *image_view,
 %        QuantumInfo *quantum_info,const QuantumType quantum_type,
-%        const unsigned char *pixels,ExceptionInfo *exception)
+%        const unsigned char *restrict pixels,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -121,7 +121,7 @@ static inline Quantum PushColormapIndex(const Image *image,const size_t index,
 }
 
 static inline const unsigned char *PushDoublePixel(QuantumInfo *quantum_info,
-  const unsigned char *pixels,double *pixel)
+  const unsigned char *restrict pixels,double *pixel)
 {
   double
     *p;
@@ -161,7 +161,7 @@ static inline const unsigned char *PushDoublePixel(QuantumInfo *quantum_info,
 }
 
 static inline const unsigned char *PushFloatPixel(QuantumInfo *quantum_info,
-  const unsigned char *pixels,float *pixel)
+  const unsigned char *restrict pixels,float *pixel)
 {
   float
     *p;
@@ -193,7 +193,7 @@ static inline const unsigned char *PushFloatPixel(QuantumInfo *quantum_info,
 }
 
 static inline const unsigned char *PushQuantumPixel(QuantumInfo *quantum_info,
-  const unsigned char *pixels,unsigned int *quantum)
+  const unsigned char *restrict pixels,unsigned int *quantum)
 {
   register ssize_t
     i;
@@ -222,7 +222,8 @@ static inline const unsigned char *PushQuantumPixel(QuantumInfo *quantum_info,
 }
 
 static inline const unsigned char *PushQuantumLongPixel(
-  QuantumInfo *quantum_info,const unsigned char *pixels,unsigned int *quantum)
+  QuantumInfo *quantum_info,const unsigned char *restrict pixels,
+  unsigned int *quantum)
 {
   register ssize_t
     i;
@@ -3414,7 +3415,7 @@ static void ImportRGBAQuantum(const Image *image,QuantumInfo *quantum_info,
 
 MagickExport size_t ImportQuantumPixels(const Image *image,
   CacheView *image_view,QuantumInfo *quantum_info,
-  const QuantumType quantum_type,const unsigned char *pixels,
+  const QuantumType quantum_type,const unsigned char *restrict pixels,
   ExceptionInfo *exception)
 {
   MagickSizeType