(no commit message)

diff --git a/coders/art.c b/coders/art.c
index 8086510e15afe96c172814892243633e69e0cf13..d13c98df2002158642a1f95b4ea9311c097e90d0 100644 (file)
--- a/coders/art.c
+++ b/coders/art.c
@@ -163,7 +163,7 @@ static Image *ReadARTImage(const ImageInfo *image_info,ExceptionInfo *exception)
   for (y=0; y < (long) image->rows; y++)
   {
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
     if (q == (PixelPacket *) NULL)

diff --git a/coders/cmyk.c b/coders/cmyk.c
index 78989b0be746df8f915a6b3c52cab150ea775849..576e3c39f5acc86740aeca6796b274288563d655 100644 (file)
--- a/coders/cmyk.c
+++ b/coders/cmyk.c
@@ -218,19 +218,19 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const IndexPacket
-            *__restrict canvas_indexes;
+            *restrict canvas_indexes;
 
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register IndexPacket
-            *__restrict indexes;
+            *restrict indexes;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -306,19 +306,19 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const IndexPacket
-            *__restrict canvas_indexes;
+            *restrict canvas_indexes;
 
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register IndexPacket
-            *__restrict indexes;
+            *restrict indexes;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -391,13 +391,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -443,13 +443,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -495,13 +495,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -547,19 +547,19 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const IndexPacket
-            *__restrict canvas_indexes;
+            *restrict canvas_indexes;
 
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register IndexPacket
-            *__restrict indexes;
+            *restrict indexes;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -609,13 +609,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
             for (y=0; y < (long) image->extract_info.height; y++)
             {
               register const PixelPacket
-                *__restrict p;
+                *restrict p;
 
               register long
                 x;
 
               register PixelPacket
-                *__restrict q;
+                *restrict q;
 
               if (count != (ssize_t) length)
                 {
@@ -701,13 +701,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -772,13 +772,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -843,13 +843,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -914,19 +914,19 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const IndexPacket
-            *__restrict canvas_indexes;
+            *restrict canvas_indexes;
 
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register IndexPacket
-            *__restrict indexes;
+            *restrict indexes;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -995,13 +995,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
             for (y=0; y < (long) image->extract_info.height; y++)
             {
               register const PixelPacket
-                *__restrict p;
+                *restrict p;
 
               register long
                 x;
 
               register PixelPacket
-                *__restrict q;
+                *restrict q;
 
               if (count != (ssize_t) length)
                 {
@@ -1266,7 +1266,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1293,7 +1293,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1343,7 +1343,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1363,7 +1363,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1383,7 +1383,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1403,7 +1403,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1425,7 +1425,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info,
             for (y=0; y < (long) image->rows; y++)
             {
               register const PixelPacket
-                *__restrict p;
+                *restrict p;
 
               p=GetVirtualPixels(image,0,y,image->columns,1,
                 &image->exception);
@@ -1468,7 +1468,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1494,7 +1494,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1520,7 +1520,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1546,7 +1546,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1574,7 +1574,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info,
             for (y=0; y < (long) image->rows; y++)
             {
               register const PixelPacket
-                *__restrict p;
+                *restrict p;
 
               p=GetVirtualPixels(image,0,y,image->columns,1,
                 &image->exception);

diff --git a/coders/gif.c b/coders/gif.c
index 440d0c7545d34171deb630cbb012d5b7d4b4def4..003d232df2b7178cfdbe2e1535e9b5645f9562d3 100644 (file)
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -412,13 +412,13 @@ static MagickBooleanType DecodeImage(Image *image,const long opacity)
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=GetAuthenticPixels(image,0,offset,image->columns,1,exception);
     if (q == (PixelPacket *) NULL)
@@ -642,10 +642,10 @@ static MagickBooleanType EncodeImage(const ImageInfo *image_info,Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;

diff --git a/coders/gray.c b/coders/gray.c
index a3e913940f47fb7eb7ffea6442036d984663a292..2169bd64c5f5d3a3f91fd43f9019131a79d3b3b6 100644 (file)
--- a/coders/gray.c
+++ b/coders/gray.c
@@ -200,13 +200,13 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
     for (y=0; y < (long) image->extract_info.height; y++)
     {
       register const PixelPacket
-        *__restrict p;
+        *restrict p;
 
       register long
         x;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       if (count != (ssize_t) length)
         {
@@ -427,7 +427,7 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info,
     for (y=0; y < (long) image->rows; y++)
     {
       register const PixelPacket
-        *__restrict p;
+        *restrict p;
 
       p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
       if (p == (const PixelPacket *) NULL)

diff --git a/coders/hald.c b/coders/hald.c
index 95a028a4040fccbe2b314c1594063a134caede46..af56cc6624c7b5a86b4fc24b23dbb7deb3c2a7be 100644 (file)
--- a/coders/hald.c
+++ b/coders/hald.c
@@ -136,7 +136,7 @@ static Image *ReadHALDImage(const ImageInfo *image_info,
       red;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;

diff --git a/coders/jpeg.c b/coders/jpeg.c
index c64b380b9817fb7c33c9f2b85e0a9097d6d17423..70c188b314072d49e0468b4e7a012bef25e4bd91 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1154,13 +1154,13 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (jpeg_read_scanlines(&jpeg_info,scanline,1) != 1)
       {

diff --git a/coders/miff.c b/coders/miff.c
index 80a37c210ec7ff1e2ce9fe2fe1281ebccd0ea237..ade4d7837ca10a7ed3f1b473e9e73b6a3f22051b 100644 (file)
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -1222,13 +1222,13 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
     for (y=0; y < (long) image->rows; y++)
     {
       register IndexPacket
-        *__restrict indexes;
+        *restrict indexes;
 
       register long
         x;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
       if (q == (PixelPacket *) NULL)
@@ -2128,10 +2128,10 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info,
     for (y=0; y < (long) image->rows; y++)
     {
       register const IndexPacket
-        *__restrict indexes;
+        *restrict indexes;
 
       register const PixelPacket
-        *__restrict p;
+        *restrict p;
 
       register long
         x;

diff --git a/coders/pnm.c b/coders/pnm.c
index e8b0fdfe7d5cb478e30a34aec6be1eb5cd5d4ea3..65699a21b154124490a5fc8063f66c8b1f48e242 100644 (file)
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -434,7 +434,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
           if (q == (PixelPacket *) NULL)
@@ -485,7 +485,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
           if (q == (PixelPacket *) NULL)
@@ -542,7 +542,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
           if (q == (PixelPacket *) NULL)
@@ -605,7 +605,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             sync;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           ssize_t
             count;
@@ -693,7 +693,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           ssize_t
             count;
@@ -811,7 +811,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           ssize_t
             count;
@@ -866,7 +866,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                   pixel;
 
                 register PixelPacket
-                  *__restrict r;
+                  *restrict r;
 
                 r=q;
                 for (x=0; x < (long) image->columns; x++)
@@ -886,7 +886,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                   pixel;
 
                 register PixelPacket
-                  *__restrict r;
+                  *restrict r;
 
                 r=q;
                 for (x=0; x < (long) image->columns; x++)
@@ -985,7 +985,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           ssize_t
             count;
@@ -1222,7 +1222,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             sync;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           ssize_t
             count;
@@ -1669,10 +1669,10 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
         for (y=0; y < (long) image->rows; y++)
         {
           register const IndexPacket
-            *__restrict indexes;
+            *restrict indexes;
 
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
@@ -1726,7 +1726,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
@@ -1784,7 +1784,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
@@ -1841,7 +1841,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -1884,7 +1884,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
@@ -1965,7 +1965,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
@@ -2044,10 +2044,10 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
         for (y=0; y < (long) image->rows; y++)
         {
           register const IndexPacket
-            *__restrict indexes;
+            *restrict indexes;
 
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
@@ -2209,7 +2209,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image)
         for (y=(long) image->rows-1; y >= 0; y--)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)

diff --git a/coders/raw.c b/coders/raw.c
index dfa92f45dd57e7977aaff75d344fce2a9f9d26e0..c6b223d198509779ffb2b75f7a2ead55b4f45a81 100644 (file)
--- a/coders/raw.c
+++ b/coders/raw.c
@@ -198,13 +198,13 @@ static Image *ReadRAWImage(const ImageInfo *image_info,
     for (y=0; y < (long) image->extract_info.height; y++)
     {
       register const PixelPacket
-        *__restrict p;
+        *restrict p;
 
       register long
         x;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       if (count != (ssize_t) length)
         {

diff --git a/coders/rgb.c b/coders/rgb.c
index 47b1a5249259ee46023d3c0fd84203a550320b14..519b2f5dd22e6dbceca0c498766fa1b19ca45145 100644 (file)
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -247,13 +247,13 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception)
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -324,13 +324,13 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception)
         for (y=0; y < (long) image->extract_info.height; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register long
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           if (count != (ssize_t) length)
             {
@@ -397,13 +397,13 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception)
           for (y=0; y < (long) image->extract_info.height; y++)
           {
             register const PixelPacket
-              *__restrict p;
+              *restrict p;
 
             register long
               x;
 
             register PixelPacket
-              *__restrict q;
+              *restrict q;
 
             if (count != (ssize_t) length)
               {
@@ -500,13 +500,13 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception)
           for (y=0; y < (long) image->extract_info.height; y++)
           {
             register const PixelPacket
-              *__restrict p;
+              *restrict p;
 
             register long
               x;
 
             register PixelPacket
-              *__restrict q;
+              *restrict q;
 
             if (count != (ssize_t) length)
               {
@@ -877,7 +877,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info,Image *image)
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
             &image->exception);
@@ -922,7 +922,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info,Image *image)
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -954,7 +954,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info,Image *image)
           for (y=0; y < (long) image->rows; y++)
           {
             register const PixelPacket
-              *__restrict p;
+              *restrict p;
 
             p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
             if (p == (const PixelPacket *) NULL)
@@ -999,7 +999,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info,Image *image)
           for (y=0; y < (long) image->rows; y++)
           {
             register const PixelPacket
-              *__restrict p;
+              *restrict p;
 
             p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
             if (p == (const PixelPacket *) NULL)

diff --git a/coders/tiff.c b/coders/tiff.c
index 4acc4257666f11d095ce4b66554c0f7f8ddfac2c..a8871b04492e41dc695712a805e11fd640ac1aff 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1221,7 +1221,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
             status;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) pixels);
           if (status == -1)
@@ -1274,7 +1274,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
             status;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) pixels);
           if (status == -1)
@@ -1305,7 +1305,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
           for (y=0; y < (long) image->rows; y++)
           {
             register PixelPacket
-              *__restrict q;
+              *restrict q;
 
             int
               status;
@@ -1366,7 +1366,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
           if (q == (PixelPacket *) NULL)
@@ -1440,7 +1440,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           unsigned long
             columns_remaining,
@@ -1542,7 +1542,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
           if (q == (PixelPacket *) NULL)
@@ -2948,7 +2948,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
             for (y=0; y < (long) image->rows; y++)
             {
               register const PixelPacket
-                *__restrict p;
+                *restrict p;
 
               p=GetVirtualPixels(image,0,y,image->columns,1,
                 &image->exception);
@@ -2976,7 +2976,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
             for (y=0; y < (long) image->rows; y++)
             {
               register const PixelPacket
-                *__restrict p;
+                *restrict p;
 
               p=GetVirtualPixels(image,0,y,image->columns,1,
                 &image->exception);
@@ -2996,7 +2996,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
             for (y=0; y < (long) image->rows; y++)
             {
               register const PixelPacket
-                *__restrict p;
+                *restrict p;
 
               p=GetVirtualPixels(image,0,y,image->columns,1,
                 &image->exception);
@@ -3016,7 +3016,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
             for (y=0; y < (long) image->rows; y++)
             {
               register const PixelPacket
-                *__restrict p;
+                *restrict p;
 
               p=GetVirtualPixels(image,0,y,image->columns,1,
                 &image->exception);
@@ -3037,7 +3037,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
               for (y=0; y < (long) image->rows; y++)
               {
                 register const PixelPacket
-                  *__restrict p;
+                  *restrict p;
 
                 p=GetVirtualPixels(image,0,y,image->columns,1,
                   &image->exception);
@@ -3072,7 +3072,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)
@@ -3142,7 +3142,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
         for (y=0; y < (long) image->rows; y++)
         {
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
           if (p == (const PixelPacket *) NULL)

diff --git a/magick/annotate.c b/magick/annotate.c
index 39d9e4239120f34f587fa8126f8f71c192003ebd..e429aa9baf94f37a78058ef5dce56b8eb399d26f 100644 (file)
--- a/magick/annotate.c
+++ b/magick/annotate.c
@@ -1273,7 +1273,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
             x;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           register unsigned char
             *p;
@@ -1684,7 +1684,7 @@ static MagickBooleanType RenderPostscript(Image *image,
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         q=GetCacheViewAuthenticPixels(annotate_view,0,y,annotate_image->columns,
           1,exception);

diff --git a/magick/attribute.c b/magick/attribute.c
index 52ac65988be069d6b5ddd92e0c6d3b4c3807882a..2cab5e7f4a85212fc11b32ffa419b70dea5050d8 100644 (file)
--- a/magick/attribute.c
+++ b/magick/attribute.c
@@ -180,10 +180,10 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image,
       bounding_box;
 
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
@@ -318,7 +318,7 @@ MagickExport unsigned long GetImageChannelDepth(const Image *image,
   if ((image->storage_class == PseudoClass) && (image->matte == MagickFalse))
     {
       register const PixelPacket
-        *__restrict p;
+        *restrict p;
 
       register long
         i;
@@ -371,10 +371,10 @@ MagickExport unsigned long GetImageChannelDepth(const Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       id,
@@ -916,13 +916,13 @@ MagickExport MagickBooleanType SetImageChannelDepth(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -965,7 +965,7 @@ MagickExport MagickBooleanType SetImageChannelDepth(Image *image,
         i;
 
       register PixelPacket
-        *__restrict p;
+        *restrict p;
 
       p=image->colormap;
       range=GetQuantumRange(depth);

diff --git a/magick/cache.c b/magick/cache.c
index d90c754db9e5abd3a942a94d3b2c78febd26a6c7..20f1893a003eba61e548e6c6f4e86115b91bb2ac 100644 (file)
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -362,18 +362,18 @@ static MagickBooleanType ClipPixelCacheNexus(Image *image,
     **image_nexus;
 
   register const PixelPacket
-    *__restrict r;
+    *restrict r;
 
   register IndexPacket
-    *__restrict nexus_indexes,
-    *__restrict indexes;
+    *restrict nexus_indexes,
+    *restrict indexes;
 
   register long
     i;
 
   register PixelPacket
-    *__restrict p,
-    *__restrict q;
+    *restrict p,
+    *restrict q;
 
   /*
     Apply clip mask.
@@ -725,7 +725,7 @@ static MagickBooleanType OpenPixelCacheOnDisk(CacheInfo *cache_info,
 
 static inline MagickOffsetType ReadPixelCacheRegion(CacheInfo *cache_info,
   const MagickOffsetType offset,const MagickSizeType length,
-  unsigned char *__restrict buffer)
+  unsigned char *restrict buffer)
 {
   register MagickOffsetType
     i;
@@ -769,7 +769,7 @@ static inline MagickOffsetType ReadPixelCacheRegion(CacheInfo *cache_info,
 
 static inline MagickOffsetType WritePixelCacheRegion(CacheInfo *cache_info,
   const MagickOffsetType offset,const MagickSizeType length,
-  const unsigned char *__restrict buffer)
+  const unsigned char *restrict buffer)
 {
   register MagickOffsetType
     i;
@@ -826,7 +826,7 @@ static MagickBooleanType CloneDiskToDiskPixelCache(CacheInfo *clone_info,
     y;
 
   register PixelPacket
-    *__restrict pixels;
+    *restrict pixels;
 
   unsigned long
     columns,
@@ -991,8 +991,8 @@ static MagickBooleanType CloneDiskToMemoryPixelCache(CacheInfo *clone_info,
     y;
 
   register PixelPacket
-    *__restrict pixels,
-    *__restrict q;
+    *restrict pixels,
+    *restrict q;
 
   unsigned long
     columns,
@@ -1103,8 +1103,8 @@ static MagickBooleanType CloneMemoryToDiskPixelCache(CacheInfo *clone_info,
     y;
 
   register PixelPacket
-    *__restrict p,
-    *__restrict pixels;
+    *restrict p,
+    *restrict pixels;
 
   unsigned long
     columns,
@@ -1250,8 +1250,8 @@ static MagickBooleanType CloneMemoryToMemoryPixelCache(CacheInfo *clone_info,
     y;
 
   register PixelPacket
-    *__restrict pixels,
-    *__restrict source_pixels;
+    *restrict pixels,
+    *restrict source_pixels;
 
   size_t
     length;
@@ -3158,20 +3158,20 @@ MagickExport const PixelPacket *GetVirtualPixelsFromNexus(const Image *image,
     region;
 
   register const IndexPacket
-    *__restrict nexus_indexes;
+    *restrict nexus_indexes;
 
   register const PixelPacket
-    *__restrict p;
+    *restrict p;
 
   register IndexPacket
-    *__restrict indexes;
+    *restrict indexes;
 
   register long
     u,
     v;
 
   register PixelPacket
-    *__restrict q;
+    *restrict q;
 
   /*
     Acquire pixels.
@@ -3766,18 +3766,18 @@ static MagickBooleanType MaskPixelCacheNexus(Image *image,NexusInfo *nexus_info,
     **image_nexus;
 
   register const PixelPacket
-    *__restrict r;
+    *restrict r;
 
   register IndexPacket
-    *__restrict nexus_indexes,
-    *__restrict indexes;
+    *restrict nexus_indexes,
+    *restrict indexes;
 
   register long
     i;
 
   register PixelPacket
-    *__restrict p,
-    *__restrict q;
+    *restrict p,
+    *restrict q;
 
   /*
     Apply clip mask.
@@ -4497,7 +4497,7 @@ static MagickBooleanType ReadPixelCacheIndexes(CacheInfo *cache_info,
     number_pixels;
 
   register IndexPacket
-    *__restrict q;
+    *restrict q;
 
   register long
     y;
@@ -4530,7 +4530,7 @@ static MagickBooleanType ReadPixelCacheIndexes(CacheInfo *cache_info,
     case MapCache:
     {
       register IndexPacket
-        *__restrict p;
+        *restrict p;
 
       /*
         Read indexes from memory.
@@ -4627,7 +4627,7 @@ static MagickBooleanType ReadPixelCachePixels(CacheInfo *cache_info,
     y;
 
   register PixelPacket
-    *__restrict q;
+    *restrict q;
 
   unsigned long
     rows;
@@ -4655,7 +4655,7 @@ static MagickBooleanType ReadPixelCachePixels(CacheInfo *cache_info,
     case MapCache:
     {
       register PixelPacket
-        *__restrict p;
+        *restrict p;
 
       /*
         Read pixels from memory.
@@ -5207,7 +5207,7 @@ static MagickBooleanType WritePixelCacheIndexes(CacheInfo *cache_info,
     number_pixels;
 
   register const IndexPacket
-    *__restrict p;
+    *restrict p;
 
   register long
     y;
@@ -5240,7 +5240,7 @@ static MagickBooleanType WritePixelCacheIndexes(CacheInfo *cache_info,
     case MapCache:
     {
       register IndexPacket
-        *__restrict q;
+        *restrict q;
 
       /*
         Write indexes to memory.
@@ -5338,7 +5338,7 @@ static MagickBooleanType WritePixelCachePixels(CacheInfo *cache_info,
     y;
 
   register const PixelPacket
-    *__restrict p;
+    *restrict p;
 
   unsigned long
     rows;
@@ -5366,7 +5366,7 @@ static MagickBooleanType WritePixelCachePixels(CacheInfo *cache_info,
     case MapCache:
     {
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       /*
         Write pixels to memory.

diff --git a/magick/cipher.c b/magick/cipher.c
index 26d5db1857dced6b0ee0956271ace3cf864afa50..6ca5d7240748bfe93f34737c2d0295ed700389ff 100644 (file)
--- a/magick/cipher.c
+++ b/magick/cipher.c
@@ -651,7 +651,7 @@ MagickExport MagickBooleanType PasskeyDecipherImage(Image *image,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
     if (q == (PixelPacket *) NULL)
@@ -860,7 +860,7 @@ MagickExport MagickBooleanType PasskeyEncipherImage(Image *image,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
     if (q == (PixelPacket *) NULL)

diff --git a/magick/colormap.c b/magick/colormap.c
index 97c3343f753c806a289066651ec5b7d0ae48c3dd..40f569dc31a380b2379b88f30655d844459827ae 100644 (file)
--- a/magick/colormap.c
+++ b/magick/colormap.c
@@ -127,13 +127,13 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image,
       index;
 
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -277,10 +277,10 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image)
       x;
 
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
     if (q == (PixelPacket *) NULL)

diff --git a/magick/colorspace.c b/magick/colorspace.c
index eb5ae730fcf7876cfbd89ebffc27255da1808efb..584d4955205c0775ce88c408384cdef656466095 100644 (file)
--- a/magick/colorspace.c
+++ b/magick/colorspace.c
@@ -232,7 +232,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -285,13 +285,13 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           pixel;
 
         register IndexPacket
-          *__restrict indexes;
+          *restrict indexes;
 
         register long
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -347,7 +347,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -403,7 +403,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -459,7 +459,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -518,7 +518,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -610,7 +610,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -1018,7 +1018,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         register unsigned long
           blue,
@@ -1431,7 +1431,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -1487,13 +1487,13 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           pixel;
 
         register IndexPacket
-          *__restrict indexes;
+          *restrict indexes;
 
         register long
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -1552,7 +1552,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -1610,7 +1610,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -1668,7 +1668,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -1729,7 +1729,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -1822,7 +1822,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -2192,7 +2192,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;

diff --git a/magick/compare.c b/magick/compare.c
index 6e05119e5a35ba61cc35986adcd001df0fc8146f..ddb6ed3ed226bedc7d28dc56fb9eb7dca0130da5 100644 (file)
--- a/magick/compare.c
+++ b/magick/compare.c
@@ -210,21 +210,21 @@ MagickExport Image *CompareImageChannels(Image *image,
       reconstruct_pixel;
 
     register const IndexPacket
-      *__restrict indexes,
-      *__restrict reconstruct_indexes;
+      *restrict indexes,
+      *restrict reconstruct_indexes;
 
     register const PixelPacket
-      *__restrict p,
-      *__restrict q;
+      *restrict p,
+      *restrict q;
 
     register IndexPacket
-      *__restrict highlight_indexes;
+      *restrict highlight_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict r;
+      *restrict r;
 
     if (status == MagickFalse)
       continue;
@@ -382,12 +382,12 @@ static MagickBooleanType GetAbsoluteError(const Image *image,
       reconstruct_pixel;
 
     register const IndexPacket
-      *__restrict indexes,
-      *__restrict reconstruct_indexes;
+      *restrict indexes,
+      *restrict reconstruct_indexes;
 
     register const PixelPacket
-      *__restrict p,
-      *__restrict q;
+      *restrict p,
+      *restrict q;
 
     register long
       i,
@@ -494,12 +494,12 @@ static MagickBooleanType GetMeanAbsoluteError(const Image *image,
       channel_distortion[AllChannels+1];
 
     register const IndexPacket
-      *__restrict indexes,
-      *__restrict reconstruct_indexes;
+      *restrict indexes,
+      *restrict reconstruct_indexes;
 
     register const PixelPacket
-      *__restrict p,
-      *__restrict q;
+      *restrict p,
+      *restrict q;
 
     register long
       i,
@@ -605,12 +605,12 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes,
-      *__restrict reconstruct_indexes;
+      *restrict indexes,
+      *restrict reconstruct_indexes;
 
     register const PixelPacket
-      *__restrict p,
-      *__restrict q;
+      *restrict p,
+      *restrict q;
 
     register long
       x;
@@ -731,12 +731,12 @@ static MagickBooleanType GetMeanSquaredError(const Image *image,
       channel_distortion[AllChannels+1];
 
     register const IndexPacket
-      *__restrict indexes,
-      *__restrict reconstruct_indexes;
+      *restrict indexes,
+      *restrict reconstruct_indexes;
 
     register const PixelPacket
-      *__restrict p,
-      *__restrict q;
+      *restrict p,
+      *restrict q;
 
     register long
       i,
@@ -837,12 +837,12 @@ static MagickBooleanType GetPeakAbsoluteError(const Image *image,
       channel_distortion[AllChannels+1];
 
     register const IndexPacket
-      *__restrict indexes,
-      *__restrict reconstruct_indexes;
+      *restrict indexes,
+      *restrict reconstruct_indexes;
 
     register const PixelPacket
-      *__restrict p,
-      *__restrict q;
+      *restrict p,
+      *restrict q;
 
     register long
       i,
@@ -1273,12 +1273,12 @@ MagickExport MagickBooleanType IsImagesEqual(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes,
-      *__restrict reconstruct_indexes;
+      *restrict indexes,
+      *restrict reconstruct_indexes;
 
     register const PixelPacket
-      *__restrict p,
-      *__restrict q;
+      *restrict p,
+      *restrict q;
 
     register long
       x;
@@ -1410,12 +1410,12 @@ static double GetSimilarityMetric(const Image *image,const Image *reference,
   for (y=0; y < (long) reference->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes,
-      *__restrict reference_indexes;
+      *restrict indexes,
+      *restrict reference_indexes;
 
     register const PixelPacket
-      *__restrict p,
-      *__restrict q;
+      *restrict p,
+      *restrict q;
 
     register long
       x;
@@ -1535,7 +1535,7 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;

diff --git a/magick/composite.c b/magick/composite.c
index 02b94627d3f298d19dfa4e9579c0e6c72006a3a4..96f60358296e72ac315ce8781319bcd2334a8274 100644 (file)
--- a/magick/composite.c
+++ b/magick/composite.c
@@ -1513,13 +1513,13 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
           sync;
 
         register const PixelPacket
-          *__restrict p;
+          *restrict p;
 
         register PixelPacket
-          *__restrict r;
+          *restrict r;
 
         register IndexPacket
-          *__restrict destination_indexes;
+          *restrict destination_indexes;
 
         register long
           x;
@@ -1574,10 +1574,10 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
         y_lookup;
 
       register IndexPacket
-        *__restrict destination_indexes;
+        *restrict destination_indexes;
 
       register PixelPacket
-        *__restrict r;
+        *restrict r;
 
       ResampleFilter
         *resample_filter;
@@ -1682,7 +1682,7 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
           sync;
 
         register const PixelPacket
-          *__restrict p;
+          *restrict p;
 
         register long
           x;
@@ -1863,19 +1863,19 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
       source;
 
     register const IndexPacket
-      *__restrict composite_indexes;
+      *restrict composite_indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;

diff --git a/magick/compress.c b/magick/compress.c
index dba307c1ba104e75441d1080354590bf265c20bd..46efa3575d2dce8efe37778ecf0dafd0cd9fc014 100644 (file)
--- a/magick/compress.c
+++ b/magick/compress.c
@@ -515,7 +515,7 @@ MagickExport MagickBooleanType HuffmanDecodeImage(Image *image)
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     /*
       Initialize scanline to white.

diff --git a/magick/decorate.c b/magick/decorate.c
index d2c05b33c65f67522b0fff2886311abc3a7e7eff..70ad84a715e2bdaee94394a0042ab77b60c4229b 100644 (file)
--- a/magick/decorate.c
+++ b/magick/decorate.c
@@ -289,13 +289,13 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
   if (height != 0)
     {
       register IndexPacket
-        *__restrict frame_indexes;
+        *restrict frame_indexes;
 
       register long
         x;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       /*
         Draw top of ornamental border.
@@ -405,13 +405,13 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict frame_indexes;
+      *restrict frame_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     /*
       Initialize scanline with matte color.
@@ -519,13 +519,13 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
   if (height != 0)
     {
       register IndexPacket
-        *__restrict frame_indexes;
+        *restrict frame_indexes;
 
       register long
         x;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       /*
         Draw bottom of ornamental border.
@@ -730,7 +730,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -797,7 +797,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -853,7 +853,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;

diff --git a/magick/deprecate.c b/magick/deprecate.c
index 438c84ff1cae5d6319d5c5f61ef7a020d3ca695c..36f07eb9d4c719e5735754d8c4d8013f907d3cce 100644 (file)
--- a/magick/deprecate.c
+++ b/magick/deprecate.c
@@ -1102,13 +1102,13 @@ MagickExport MagickBooleanType ColorFloodfillImage(Image *image,
   while (s > segment_stack)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     /*
       Pop segment off stack.
@@ -1222,13 +1222,13 @@ MagickExport MagickBooleanType ColorFloodfillImage(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     /*
       Tile fill color onto floodplane.
@@ -4048,13 +4048,13 @@ MagickExport MagickBooleanType MatteFloodfillImage(Image *image,
   while (s > segment_stack)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     /*
       Pop segment off stack.
@@ -4168,13 +4168,13 @@ MagickExport MagickBooleanType MatteFloodfillImage(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     /*
       Tile fill color onto floodplane.
@@ -4298,7 +4298,7 @@ MagickExport MagickBooleanType OpaqueImage(Image *image,
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         q=GetAuthenticPixels(image,0,y,image->columns,1,&image->exception);
         if (q == (PixelPacket *) NULL)
@@ -4335,7 +4335,7 @@ MagickExport MagickBooleanType OpaqueImage(Image *image,
               x;
 
             register PixelPacket
-              *__restrict q;
+              *restrict q;
 
             q=GetAuthenticPixels(image,0,y,image->columns,1,&image->exception);
             if (q == (PixelPacket *) NULL)
@@ -4972,10 +4972,10 @@ MagickExport unsigned int RandomChannelThresholdImage(Image *image,const char
 
     register IndexPacket
       index,
-      *__restrict indexes;
+      *restrict indexes;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
     if (q == (PixelPacket *) NULL)
@@ -5292,13 +5292,13 @@ MagickExport void SetImage(Image *image,const Quantum opacity)
       for (y=0; y < (long) image->rows; y++)
       {
         register IndexPacket
-          *__restrict indexes;
+          *restrict indexes;
 
         register long
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         q=QueueAuthenticPixels(image,0,y,image->columns,1,&image->exception);
         if (q == (PixelPacket *) NULL)
@@ -5322,7 +5322,7 @@ MagickExport void SetImage(Image *image,const Quantum opacity)
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=QueueAuthenticPixels(image,0,y,image->columns,1,&image->exception);
     if (q == (PixelPacket *) NULL)
@@ -5920,13 +5920,13 @@ MagickExport unsigned int ThresholdImage(Image *image,const double threshold)
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=GetAuthenticPixels(image,0,y,image->columns,1,&image->exception);
     if (q == (PixelPacket *) NULL)
@@ -6036,13 +6036,13 @@ MagickExport unsigned int ThresholdImageChannel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=GetAuthenticPixels(image,0,y,image->columns,1,&image->exception);
     if (q == (PixelPacket *) NULL)
@@ -6294,7 +6294,7 @@ MagickExport MagickBooleanType TransparentImage(Image *image,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=GetAuthenticPixels(image,0,y,image->columns,1,&image->exception);
     if (q == (PixelPacket *) NULL)

diff --git a/magick/distort.c b/magick/distort.c
index bd549484eb41854388900831c274375b723f30ab..eca27dfcdbcc94fc37cd18abd566d9eef0aa1bf1 100644 (file)
--- a/magick/distort.c
+++ b/magick/distort.c
@@ -1961,14 +1961,14 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
         d,s;  /* transform destination image x,y  to source image x,y */
 
       register IndexPacket
-        *__restrict indexes;
+        *restrict indexes;
 
       register long
         i,
         id;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       q=QueueCacheViewAuthenticPixels(distort_view,0,j,distort_image->columns,1,
         exception);
@@ -2520,13 +2520,13 @@ MagickExport Image *SparseColorImage(const Image *image,
         pixel;    /* pixel to assign to distorted image */
 
       register IndexPacket
-        *__restrict indexes;
+        *restrict indexes;
 
       register long
         i;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       q=QueueCacheViewAuthenticPixels(sparse_view,0,j,sparse_image->columns,
         1,exception);

diff --git a/magick/draw.c b/magick/draw.c
index 7ee80b83529aef4eae2132fc9d2e7149d85c8dd7..4280d7d40936bcc5d9df9ca0787cc2d41a0b25f1 100644 (file)
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -1184,14 +1184,14 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image,
       point;
 
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       id,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     SegmentInfo
       inverse_edge;
@@ -3289,14 +3289,14 @@ MagickExport MagickBooleanType DrawGradientImage(Image *image,
       offset;
 
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       i,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -3892,7 +3892,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image,
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -3945,7 +3945,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -4203,7 +4203,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
           for (y=0; y < (long) image->rows; y++)
           {
             register PixelPacket
-              *__restrict q;
+              *restrict q;
 
             q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
               exception);
@@ -4254,7 +4254,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
               x;
 
             register PixelPacket
-              *__restrict q;
+              *restrict q;
 
             q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
               exception);
@@ -4313,7 +4313,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
               x;
 
             register PixelPacket
-              *__restrict q;
+              *restrict q;
 
             q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
               exception);
@@ -4368,7 +4368,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
               x;
 
             register PixelPacket
-              *__restrict q;
+              *restrict q;
 
             q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
               exception);

diff --git a/magick/effect.c b/magick/effect.c
index 65111ae1f6ed296a8bd39c8e06567c8ccd47e9dc..293c8245c8034ef2bddb0eba1188e4a56c0ba3b9 100644 (file)
--- a/magick/effect.c
+++ b/magick/effect.c
@@ -273,20 +273,20 @@ MagickExport Image *AdaptiveBlurImageChannel(const Image *image,
   for (y=0; y < (long) blur_image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p,
-      *__restrict r;
+      *restrict p,
+      *restrict r;
 
     register IndexPacket
-      *__restrict blur_indexes;
+      *restrict blur_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -309,7 +309,7 @@ MagickExport Image *AdaptiveBlurImageChannel(const Image *image,
         gamma;
 
       register const double
-        *__restrict k;
+        *restrict k;
 
       register long
         i,
@@ -590,20 +590,20 @@ MagickExport Image *AdaptiveSharpenImageChannel(const Image *image,
   for (y=0; y < (long) sharp_image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p,
-      *__restrict r;
+      *restrict p,
+      *restrict r;
 
     register IndexPacket
-      *__restrict sharp_indexes;
+      *restrict sharp_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -626,7 +626,7 @@ MagickExport Image *AdaptiveSharpenImageChannel(const Image *image,
         gamma;
 
       register const double
-        *__restrict k;
+        *restrict k;
 
       register long
         i,
@@ -908,19 +908,19 @@ MagickExport Image *BlurImageChannel(const Image *image,
   for (y=0; y < (long) blur_image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict blur_indexes;
+      *restrict blur_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -941,10 +941,10 @@ MagickExport Image *BlurImageChannel(const Image *image,
         pixel;
 
       register const double
-        *__restrict k;
+        *restrict k;
 
       register const PixelPacket
-        *__restrict kernel_pixels;
+        *restrict kernel_pixels;
 
       register long
         i;
@@ -984,7 +984,7 @@ MagickExport Image *BlurImageChannel(const Image *image,
               (image->colorspace == CMYKColorspace))
             {
               register const IndexPacket
-                *__restrict kernel_indexes;
+                *restrict kernel_indexes;
 
               k=kernel;
               kernel_indexes=indexes;
@@ -1038,7 +1038,7 @@ MagickExport Image *BlurImageChannel(const Image *image,
               (image->colorspace == CMYKColorspace))
             {
               register const IndexPacket
-                *__restrict kernel_indexes;
+                *restrict kernel_indexes;
 
               k=kernel;
               kernel_pixels=p;
@@ -1087,19 +1087,19 @@ MagickExport Image *BlurImageChannel(const Image *image,
   for (x=0; x < (long) blur_image->columns; x++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict blur_indexes;
+      *restrict blur_indexes;
 
     register long
       y;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -1119,10 +1119,10 @@ MagickExport Image *BlurImageChannel(const Image *image,
         pixel;
 
       register const double
-        *__restrict k;
+        *restrict k;
 
       register const PixelPacket
-        *__restrict kernel_pixels;
+        *restrict kernel_pixels;
 
       register long
         i;
@@ -1162,7 +1162,7 @@ MagickExport Image *BlurImageChannel(const Image *image,
               (image->colorspace == CMYKColorspace))
             {
               register const IndexPacket
-                *__restrict kernel_indexes;
+                *restrict kernel_indexes;
 
               k=kernel;
               kernel_indexes=indexes;
@@ -1216,7 +1216,7 @@ MagickExport Image *BlurImageChannel(const Image *image,
               (image->colorspace == CMYKColorspace))
             {
               register const IndexPacket
-                *__restrict kernel_indexes;
+                *restrict kernel_indexes;
 
               k=kernel;
               kernel_pixels=p;
@@ -1521,7 +1521,7 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception)
     for (y=0; y < (long) image->rows; y++)
     {
       register const PixelPacket
-        *__restrict p;
+        *restrict p;
 
       p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
       if (p == (const PixelPacket *) NULL)
@@ -1557,7 +1557,7 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception)
         sync;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       q=GetCacheViewAuthenticPixels(despeckle_view,0,y,despeckle_image->columns,
         1,exception);
@@ -2244,20 +2244,20 @@ MagickExport Image *MedianFilterImage(const Image *image,const double radius,
   for (y=0; y < (long) median_image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict median_indexes;
+      *restrict median_indexes;
 
     register long
       id,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -2279,10 +2279,10 @@ MagickExport Image *MedianFilterImage(const Image *image,const double radius,
         pixel;
 
       register const PixelPacket
-        *__restrict r;
+        *restrict r;
 
       register const IndexPacket
-        *__restrict s;
+        *restrict s;
 
       register long
         u,
@@ -2516,13 +2516,13 @@ MagickExport Image *MotionBlurImageChannel(const Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict blur_indexes;
+      *restrict blur_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -2543,13 +2543,13 @@ MagickExport Image *MotionBlurImageChannel(const Image *image,
         pixel;
 
       register double
-        *__restrict k;
+        *restrict k;
 
       register long
         i;
 
       register const IndexPacket
-        *__restrict indexes;
+        *restrict indexes;
 
       k=kernel;
       qixel=bias;
@@ -3291,16 +3291,16 @@ MagickExport Image *RadialBlurImageChannel(const Image *image,
   for (y=0; y < (long) blur_image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register IndexPacket
-      *__restrict blur_indexes;
+      *restrict blur_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -3602,20 +3602,20 @@ MagickExport Image *ReduceNoiseImage(const Image *image,const double radius,
   for (y=0; y < (long) noise_image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict noise_indexes;
+      *restrict noise_indexes;
 
     register long
       id,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -3637,10 +3637,10 @@ MagickExport Image *ReduceNoiseImage(const Image *image,const double radius,
         pixel;
 
       register const PixelPacket
-        *__restrict r;
+        *restrict r;
 
       register const IndexPacket
-        *__restrict s;
+        *restrict s;
 
       register long
         u,
@@ -3862,19 +3862,19 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
       gamma;
 
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict blur_indexes;
+      *restrict blur_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -3899,7 +3899,7 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image,
         pixel;
 
       register const double
-        *__restrict k;
+        *restrict k;
 
       register long
         u;
@@ -4200,16 +4200,16 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray,
       normal;
 
     register const PixelPacket
-      *__restrict p,
-      *__restrict s0,
-      *__restrict s1,
-      *__restrict s2;
+      *restrict p,
+      *restrict s0,
+      *restrict s1,
+      *restrict s2;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -4492,14 +4492,14 @@ MagickExport Image *SpreadImage(const Image *image,const double radius,
       pixel;
 
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       id,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -4651,19 +4651,19 @@ MagickExport Image *UnsharpMaskImageChannel(const Image *image,
       pixel;
 
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict unsharp_indexes;
+      *restrict unsharp_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;

diff --git a/magick/enhance.c b/magick/enhance.c
index 2e979adbada5525cd9a234535abb475a08f22340..f3ddf603769e0ca3900981e674d614c4ae83621f 100644 (file)
--- a/magick/enhance.c
+++ b/magick/enhance.c
@@ -517,7 +517,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -662,14 +662,14 @@ MagickExport MagickBooleanType ClutImageChannel(Image *image,
       pixel;
 
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       id,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -895,7 +895,7 @@ MagickExport MagickBooleanType ContrastImage(Image *image,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -1064,10 +1064,10 @@ MagickExport MagickBooleanType ContrastStretchImageChannel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
@@ -1348,13 +1348,13 @@ MagickExport MagickBooleanType ContrastStretchImageChannel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -1527,13 +1527,13 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception)
   for (y=0; y < (long) image->rows; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     /*
       Read another scan line.
@@ -1563,7 +1563,7 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception)
         pixel;
 
       register const PixelPacket
-        *__restrict r;
+        *restrict r;
 
       /*
         Compute weighted average of target pixel color components.
@@ -1704,10 +1704,10 @@ MagickExport MagickBooleanType EqualizeImageChannel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
@@ -1818,13 +1818,13 @@ MagickExport MagickBooleanType EqualizeImageChannel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -2038,13 +2038,13 @@ MagickExport MagickBooleanType GammaImageChannel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -2239,14 +2239,14 @@ MagickExport MagickBooleanType HaldClutImageChannel(Image *image,
       pixel4;
 
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       id,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -2521,13 +2521,13 @@ MagickExport MagickBooleanType LevelImageChannel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -2678,13 +2678,13 @@ MagickExport MagickBooleanType LevelizeImageChannel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -2913,7 +2913,7 @@ MagickExport MagickBooleanType LinearStretchImage(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
@@ -3167,7 +3167,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate)
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -3331,13 +3331,13 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image,
           sync;
 
         register IndexPacket
-          *__restrict indexes;
+          *restrict indexes;
 
         register long
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -3398,13 +3398,13 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -3663,13 +3663,13 @@ MagickExport MagickBooleanType SigmoidalContrastImageChannel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;

diff --git a/magick/fx.c b/magick/fx.c
index f4a5713531d0b844050c6fa79aeed1c16e7f6efc..b9de4191397308c3f6e09a48e4d087ee6ebf4fe1 100644 (file)
--- a/magick/fx.c
+++ b/magick/fx.c
@@ -342,20 +342,20 @@ MagickExport Image *AddNoiseImageChannel(const Image *image,
       sync;
 
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict noise_indexes;
+      *restrict noise_indexes;
 
     register long
       id,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -504,13 +504,13 @@ MagickExport Image *BlueShiftImage(const Image *image,const double factor,
       quantum;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -745,13 +745,13 @@ MagickExport Image *ColorizeImage(const Image *image,const char *opacity,
       sync;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -966,19 +966,19 @@ MagickExport Image *ConvolveImageChannel(const Image *image,
       sync;
 
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict convolve_indexes;
+      *restrict convolve_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -1002,10 +1002,10 @@ MagickExport Image *ConvolveImageChannel(const Image *image,
         pixel;
 
       register const double
-        *__restrict k;
+        *restrict k;
 
       register const PixelPacket
-        *__restrict kernel_pixels;
+        *restrict kernel_pixels;
 
       register long
         u;
@@ -1051,7 +1051,7 @@ MagickExport Image *ConvolveImageChannel(const Image *image,
               (image->colorspace == CMYKColorspace))
             {
               register const IndexPacket
-                *__restrict kernel_indexes;
+                *restrict kernel_indexes;
 
               k=normal_kernel;
               kernel_indexes=indexes;
@@ -1115,7 +1115,7 @@ MagickExport Image *ConvolveImageChannel(const Image *image,
               (image->colorspace == CMYKColorspace))
             {
               register const IndexPacket
-                *__restrict kernel_indexes;
+                *restrict kernel_indexes;
 
               k=normal_kernel;
               kernel_pixels=p;
@@ -1478,14 +1478,14 @@ MagickExport MagickBooleanType EvaluateImageChannel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       id,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -1710,13 +1710,13 @@ MagickExport MagickBooleanType FunctionImageChannel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -3549,14 +3549,14 @@ MagickExport Image *FxImageChannel(const Image *image,const ChannelType channel,
       alpha;
 
     register IndexPacket
-      *__restrict fx_indexes;
+      *restrict fx_indexes;
 
     register long
       id,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -3758,14 +3758,14 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount,
       delta;
 
     register IndexPacket
-      *__restrict implode_indexes;
+      *restrict implode_indexes;
 
     register long
       id,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -3974,13 +3974,13 @@ MagickExport Image *MorphImages(const Image *image,
           sync;
 
         register const PixelPacket
-          *__restrict p;
+          *restrict p;
 
         register long
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -4155,7 +4155,7 @@ MagickExport MagickBooleanType PlasmaImageProxy(Image *image,
   if ((segment->x1 != (double) x_mid) || (segment->x2 != (double) x_mid))
     {
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       /*
         Left pixel.
@@ -4200,7 +4200,7 @@ MagickExport MagickBooleanType PlasmaImageProxy(Image *image,
       if ((segment->x1 != (double) x_mid) || (segment->y2 != (double) y_mid))
         {
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           /*
             Bottom pixel.
@@ -4224,7 +4224,7 @@ MagickExport MagickBooleanType PlasmaImageProxy(Image *image,
       if (segment->y1 != segment->y2)
         {
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           /*
             Top pixel.
@@ -4249,7 +4249,7 @@ MagickExport MagickBooleanType PlasmaImageProxy(Image *image,
   if ((segment->x1 != segment->x2) || (segment->y1 != segment->y2))
     {
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       /*
         Middle pixel.
@@ -4592,22 +4592,22 @@ MagickExport Image *RecolorImage(const Image *image,const unsigned long order,
   for (y=0; y < (long) image->rows; y++)
   {
     register const double
-      *__restrict k;
+      *restrict k;
 
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
 
     register IndexPacket
-      *__restrict recolor_indexes;
+      *restrict recolor_indexes;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -4822,13 +4822,13 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold,
   for (y=0; y < (long) image->rows; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -4983,7 +4983,7 @@ MagickExport Image *ShadowImage(const Image *image,const double opacity,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -5116,13 +5116,13 @@ MagickExport Image *SketchImage(const Image *image,const double radius,
       pixel;
 
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=QueueCacheViewAuthenticPixels(random_view,0,y,random_image->columns,1,
       exception);
@@ -5272,7 +5272,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -5560,14 +5560,14 @@ MagickExport Image *StereoAnaglyphImage(const Image *left_image,
   for (y=0; y < (long) stereo_image->rows; y++)
   {
     register const PixelPacket
-      *__restrict p,
-      *__restrict q;
+      *restrict p,
+      *restrict q;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict r;
+      *restrict r;
 
     p=GetVirtualPixels(left_image,-x_offset,y-y_offset,image->columns,1,
       exception);
@@ -5719,14 +5719,14 @@ MagickExport Image *SwirlImage(const Image *image,double degrees,
       delta;
 
     register IndexPacket
-      *__restrict swirl_indexes;
+      *restrict swirl_indexes;
 
     register long
       id,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -5907,13 +5907,13 @@ MagickExport Image *TintImage(const Image *image,const char *opacity,
   for (y=0; y < (long) image->rows; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -6176,14 +6176,14 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude,
       pixel;
 
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       id,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;

diff --git a/magick/histogram.c b/magick/histogram.c
index 54bde2b68a2f0b944096b69ba132bca3bac2217a..b458f5b765c6ad85a9804c3c27dee071f66e6ba6 100644 (file)
--- a/magick/histogram.c
+++ b/magick/histogram.c
@@ -1227,10 +1227,10 @@ static void UniqueColorsToImage(Image *image,CubeInfo *cube_info,
         *p;
 
       register IndexPacket
-        *__restrict indexes;
+        *restrict indexes;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       p=node_info->list;
       for (i=0; i < (long) node_info->number_unique; i++)

diff --git a/magick/identify.c b/magick/identify.c
index bf810dd625afe01ce29247cb112fac3d49759f7b..4c1e4021201f950534b8755f9ff3ad008f4fe762 100644 (file)
--- a/magick/identify.c
+++ b/magick/identify.c
@@ -581,7 +581,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
             pixel;
 
           register PixelPacket
-            *__restrict p;
+            *restrict p;
 
           GetMagickPixelPacket(image,&pixel);
           p=image->colormap;

diff --git a/magick/image.c b/magick/image.c
index 4a02eba0eb3c43cbf13323676903df0cf46e612b..58352f34e04db21f9903d1020970722eb40d8fe9 100644 (file)
--- a/magick/image.c
+++ b/magick/image.c
@@ -560,19 +560,19 @@ MagickExport Image *AppendImages(const Image *image,
         sync;
 
       register const IndexPacket
-        *__restrict indexes;
+        *restrict indexes;
 
       register const PixelPacket
-        *__restrict p;
+        *restrict p;
 
       register IndexPacket
-        *__restrict append_indexes;
+        *restrict append_indexes;
 
       register long
         x;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       if (status == MagickFalse)
         continue;
@@ -1107,13 +1107,13 @@ MagickExport Image *CombineImages(const Image *image,const ChannelType channel,
       *pixels;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -2142,13 +2142,13 @@ MagickExport Image *NewMagickImage(const ImageInfo *image_info,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=QueueCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
     if (q == (PixelPacket *) NULL)
@@ -2345,13 +2345,13 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -2632,13 +2632,13 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
       for (y=0; y < (long) image->rows; y++)
       {
         register IndexPacket
-          *__restrict indexes;
+          *restrict indexes;
 
         register long
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -2808,13 +2808,13 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image)
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -3478,7 +3478,7 @@ MagickExport MagickBooleanType SetImageOpacity(Image *image,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -3814,13 +3814,13 @@ MagickExport MagickBooleanType SyncImage(Image *image)
       pixel;
 
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
     if (q == (PixelPacket *) NULL)

diff --git a/magick/layer.c b/magick/layer.c
index b7c686b9c6a515ac66ca2e04bcd3497682c76755..c3eda2d1c14ce0e6dd6693b37b344acc70445a6b 100644 (file)
--- a/magick/layer.c
+++ b/magick/layer.c
@@ -111,7 +111,7 @@ static void ClearBounds(Image *image,RectangleInfo *bounds)
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=GetAuthenticPixels(image,bounds->x,bounds->y+y,bounds->width,1,exception);
     if (q == (PixelPacket *) NULL)

diff --git a/magick/mac.c b/magick/mac.c
index ad219d937c1c23cff7eed658617ed69b223d6a36..d74e44cf16da508c07be886410148d72ca4c64a2 100644 (file)
--- a/magick/mac.c
+++ b/magick/mac.c
@@ -1350,13 +1350,13 @@ MagickExport Image *ReadPICTImage(const ImageInfo *image_info,
   for (y=0; y < image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
     if (q == (PixelPacket *) NULL)

diff --git a/magick/paint.c b/magick/paint.c
index 89e71aa9bcc37029fcb101054ff61ae7b3385f7d..605630fd905cc6f6dcdbde8d2a47c7fe5e54683d 100644 (file)
--- a/magick/paint.c
+++ b/magick/paint.c
@@ -206,16 +206,16 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
   while (s > segment_stack)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     /*
       Pop segment off stack.
@@ -315,16 +315,16 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     /*
       Tile fill color onto floodplane.
@@ -606,19 +606,19 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius,
   for (y=0; y < (long) image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict paint_indexes;
+      *restrict paint_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     register unsigned long
       *histogram;
@@ -798,13 +798,13 @@ MagickExport MagickBooleanType OpaquePaintImageChannel(Image *image,
       pixel;
 
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -940,13 +940,13 @@ MagickExport MagickBooleanType TransparentPaintImage(Image *image,
       pixel;
 
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -1073,13 +1073,13 @@ MagickExport MagickBooleanType TransparentPaintImageChroma(Image *image,
       pixel;
 
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;

diff --git a/magick/profile.c b/magick/profile.c
index 459769130e92069cc10d57533cc5a5359b82b7aa..98309ed83f7b86e24dcf2abf8f7a5a9ddcf6853f 100644 (file)
--- a/magick/profile.c
+++ b/magick/profile.c
@@ -1159,14 +1159,14 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
               sync;
 
             register IndexPacket
-              *__restrict indexes;
+              *restrict indexes;
 
             register long
               id,
               x;
 
             register PixelPacket
-              *__restrict q;
+              *restrict q;
 
             register unsigned short
               *p;

diff --git a/magick/quantize.c b/magick/quantize.c
index 0f124c553680e99487c0434723942b8d640e405b..f5c2a7cadd715ea2350517fae9d3a42df9fb197b 100644 (file)
--- a/magick/quantize.c
+++ b/magick/quantize.c
@@ -542,10 +542,10 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info)
       for (y=0; y < (long) image->rows; y++)
       {
         register IndexPacket
-          *__restrict indexes;
+          *restrict indexes;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
           exception);
@@ -609,7 +609,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info)
         intensity;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       /*
         Monochrome image.
@@ -763,7 +763,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info,
   for (y=0; y < (long) image->rows; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
@@ -851,7 +851,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info,
   for (y++; y < (long) image->rows; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
@@ -1040,10 +1040,10 @@ static void ClosestColor(const Image *image,CubeInfo *cube_info,
         distance;
 
       register PixelPacket
-        *__restrict p;
+        *restrict p;
 
       register RealPixelPacket
-        *__restrict q;
+        *restrict q;
 
       /*
         Determine if this color is "closest".
@@ -1175,7 +1175,7 @@ static unsigned long DefineImageColormap(Image *image,CubeInfo *cube_info,
         alpha;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       /*
         Colormap entry is defined by the mean color in this cube.
@@ -1386,14 +1386,14 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info)
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       i,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
     if (q == (PixelPacket *) NULL)
@@ -1631,13 +1631,13 @@ static MagickBooleanType RiemersmaDither(Image *image,CacheView *image_view,
         *exception;
 
       register IndexPacket
-        *__restrict indexes;
+        *restrict indexes;
 
       register long
         i;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       /*
         Distribute error.
@@ -2048,7 +2048,7 @@ MagickExport MagickBooleanType GetImageQuantizeError(Image *image)
   for (y=0; y < (long) image->rows; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
@@ -2185,7 +2185,7 @@ MagickExport MagickBooleanType PosterizeImage(Image *image,
     i;
 
   register PixelPacket
-    *__restrict q;
+    *restrict q;
 
   CacheView
     *posterize_view;
@@ -3028,13 +3028,13 @@ static MagickBooleanType SetGrayscaleImage(Image *image)
       for (y=0; y < (long) image->rows; y++)
       {
         register IndexPacket
-          *__restrict indexes;
+          *restrict indexes;
 
         register long
           x;
 
         register const PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -3104,13 +3104,13 @@ static MagickBooleanType SetGrayscaleImage(Image *image)
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register const PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;

diff --git a/magick/quantum-export.c b/magick/quantum-export.c
index dc20c21519973b449449fcd720b32bfdad1c0a12..8eade97a4b2e7f4d572831be19774e6b82078c6c 100644 (file)
--- a/magick/quantum-export.c
+++ b/magick/quantum-export.c
@@ -289,7 +289,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
   if (quantum_info->alpha_type == AssociatedQuantumAlpha)
     {
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       /*
         Associate alpha.
@@ -309,7 +309,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
   if ((quantum_type == RGBOQuantum) || (quantum_type == CMYKOQuantum))
     {
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       q=GetAuthenticPixelQueue(image);
       if (image_view != (CacheView *) NULL)
@@ -326,7 +326,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
         quantum;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       q=GetAuthenticPixelQueue(image);
       if (image_view != (CacheView *) NULL)
@@ -2329,7 +2329,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
         quantum;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       q=GetAuthenticPixelQueue(image);
       if (image_view != (CacheView *) NULL)
@@ -2345,7 +2345,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
   if ((quantum_type == RGBOQuantum) || (quantum_type == CMYKOQuantum))
     {
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       q=GetAuthenticPixelQueue(image);
       if (image_view != (CacheView *) NULL)

diff --git a/magick/quantum-import.c b/magick/quantum-import.c
index 5293429e7474ed7a56a5ba7624e42af201481d9b..9d705aa4b8ba24548226257459c47757ca533fff 100644 (file)
--- a/magick/quantum-import.c
+++ b/magick/quantum-import.c
@@ -273,13 +273,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
     *p;
 
   register IndexPacket
-    *indexes;
+    *restrict indexes;
 
   register long
     x;
 
   register PixelPacket
-    *__restrict q;
+    *restrict q;
 
   size_t
     extent;
@@ -2474,7 +2474,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
         quantum;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       q=GetAuthenticPixelQueue(image);
       if (image_view != (CacheView *) NULL)
@@ -2490,7 +2490,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
   if ((quantum_type == RGBOQuantum) || (quantum_type == CMYKOQuantum))
     {
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       q=GetAuthenticPixelQueue(image);
       if (image_view != (CacheView *) NULL)
@@ -2507,7 +2507,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view,
         alpha;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       /*
         Disassociate alpha.

diff --git a/magick/resize.c b/magick/resize.c
index 0c69172bec679521f4b35e9a8bedb81ba22d309c..012c7fa27ffd01d2401c56f6d2e61c177ffd45ba 100644 (file)
--- a/magick/resize.c
+++ b/magick/resize.c
@@ -841,13 +841,13 @@ MagickExport Image *AdaptiveResizeImage(const Image *image,
   for (y=0; y < (long) resize_image->rows; y++)
   {
     register IndexPacket
-      *__restrict resize_indexes;
+      *restrict resize_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=QueueCacheViewAuthenticPixels(resize_view,0,y,resize_image->columns,1,
       exception);
@@ -1502,10 +1502,10 @@ MagickExport Image *LiquidRescaleImage(const Image *image,
   while (lqr_carver_scan(carver,&x,&y,&packet) != 0)
   {
     register IndexPacket
-      *__restrict rescale_indexes;
+      *restrict rescale_indexes;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=QueueAuthenticPixels(rescale_image,x,y,1,1,exception);
     if (q == (PixelPacket *) NULL)
@@ -1736,22 +1736,22 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter,
       density;
 
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register ContributionInfo
-      *__restrict contribution;
+      *restrict contribution;
 
     register IndexPacket
-      *__restrict resize_indexes;
+      *restrict resize_indexes;
 
     register long
       y;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -1977,22 +1977,22 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter,
       density;
 
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register ContributionInfo
-      *__restrict contribution;
+      *restrict contribution;
 
     register IndexPacket
-      *__restrict resize_indexes;
+      *restrict resize_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -2344,19 +2344,19 @@ MagickExport Image *SampleImage(const Image *image,const unsigned long columns,
       y_offset;
 
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict sample_indexes;
+      *restrict sample_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -2522,23 +2522,23 @@ MagickExport Image *ScaleImage(const Image *image,const unsigned long columns,
   for (y=0; y < (long) scale_image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict scale_indexes;
+      *restrict scale_indexes;
 
     register long
       x;
 
     register MagickPixelPacket
-      *__restrict s,
-      *__restrict t;
+      *restrict s,
+      *restrict t;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=QueueAuthenticPixels(scale_image,0,y,scale_image->columns,1,exception);
     if (q == (PixelPacket *) NULL)

diff --git a/magick/segment.c b/magick/segment.c
index 06bd4258c94dce36212815052bc8b4daf0844451..b3e9830188d1844f81b557992255b7dc81d4ae7f 100644 (file)
--- a/magick/segment.c
+++ b/magick/segment.c
@@ -528,16 +528,16 @@ static MagickBooleanType Classify(Image *image,short **extrema,
       *cluster;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;

diff --git a/magick/shear.c b/magick/shear.c
index d445e73c48771de2b63dec34af2563d8c4b00d06..8b470fc6b5237a79c80cbe0b759e1b886c89dcbf 100644 (file)
--- a/magick/shear.c
+++ b/magick/shear.c
@@ -712,7 +712,7 @@ static MagickBooleanType RadonTransform(const Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       i,
@@ -763,7 +763,7 @@ static MagickBooleanType RadonTransform(const Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       i,
@@ -839,7 +839,7 @@ static void GetImageBackgroundColor(Image *image,const long offset,
   for (y=0; y < (long) image->rows; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
@@ -1090,19 +1090,19 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations,
             sync;
 
           register const IndexPacket
-            *__restrict indexes;
+            *restrict indexes;
 
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register IndexPacket
-            *__restrict rotate_indexes;
+            *restrict rotate_indexes;
 
           register long
             y;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           unsigned long
             height,
@@ -1127,7 +1127,7 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations,
           for (y=0; y < (long) width; y++)
           {
             register const PixelPacket
-              *__restrict tile_pixels;
+              *restrict tile_pixels;
 
             register long
               x;
@@ -1151,7 +1151,7 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations,
                 (rotate_indexes != (IndexPacket *) NULL))
               {
                 register const IndexPacket
-                  *__restrict tile_indexes;
+                  *restrict tile_indexes;
 
                 tile_indexes=indexes+(height-1)*width+y;
                 for (x=0; x < (long) height; x++)
@@ -1197,19 +1197,19 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations,
           sync;
 
         register const IndexPacket
-          *__restrict indexes;
+          *restrict indexes;
 
         register const PixelPacket
-          *__restrict p;
+          *restrict p;
 
         register IndexPacket
-          *__restrict rotate_indexes;
+          *restrict rotate_indexes;
 
         register long
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -1280,19 +1280,19 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations,
             sync;
 
           register const IndexPacket
-            *__restrict indexes;
+            *restrict indexes;
 
           register const PixelPacket
-            *__restrict p;
+            *restrict p;
 
           register IndexPacket
-            *__restrict rotate_indexes;
+            *restrict rotate_indexes;
 
           register long
             y;
 
           register PixelPacket
-            *__restrict q;
+            *restrict q;
 
           unsigned long
             height,
@@ -1317,7 +1317,7 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations,
           for (y=0; y < (long) width; y++)
           {
             register const PixelPacket
-              *__restrict tile_pixels;
+              *restrict tile_pixels;
 
             register long
               x;
@@ -1340,7 +1340,7 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations,
                 (rotate_indexes != (IndexPacket *) NULL))
               {
                 register const IndexPacket
-                  *__restrict tile_indexes;
+                  *restrict tile_indexes;
 
                 tile_indexes=indexes+(width-1)-y;
                 for (x=0; x < (long) height; x++)
@@ -1481,12 +1481,12 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees,
       i;
 
     register IndexPacket
-      *__restrict indexes,
-      *__restrict shear_indexes;
+      *restrict indexes,
+      *restrict shear_indexes;
 
     register PixelPacket
-      *__restrict p,
-      *__restrict q;
+      *restrict p,
+      *restrict q;
 
     ShearDirection
       direction;
@@ -1698,15 +1698,15 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees,
       displacement;
 
     register IndexPacket
-      *__restrict indexes,
-      *__restrict shear_indexes;
+      *restrict indexes,
+      *restrict shear_indexes;
 
     register long
       i;
 
     register PixelPacket
-      *__restrict p,
-      *__restrict q;
+      *restrict p,
+      *restrict q;
 
     ShearDirection
       direction;

diff --git a/magick/statistic.c b/magick/statistic.c
index 95cb75e56126763e75fb9eb9a440c9b7134be9b2..1dffd9e43e4846f123ffc2aba82eb33302013327 100644 (file)
--- a/magick/statistic.c
+++ b/magick/statistic.c
@@ -242,7 +242,7 @@ MagickExport Image *AverageImages(const Image *image,ExceptionInfo *exception)
       pixel;
 
     register IndexPacket
-      *__restrict average_indexes;
+      *restrict average_indexes;
 
     register long
       i,
@@ -253,7 +253,7 @@ MagickExport Image *AverageImages(const Image *image,ExceptionInfo *exception)
       *average_pixel;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -465,10 +465,10 @@ MagickExport MagickBooleanType GetImageChannelMean(const Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
@@ -599,10 +599,10 @@ MagickExport MagickBooleanType GetImageChannelKurtosis(const Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
@@ -741,10 +741,10 @@ MagickExport MagickBooleanType GetImageChannelRange(const Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;
@@ -900,10 +900,10 @@ MagickExport ChannelStatistics *GetImageChannelStatistics(const Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register long
       x;

diff --git a/magick/studio.h b/magick/studio.h
index 5d4c719649871908c8fc9f89ca974b343547fd71..8395650f6c91995235d6f34d7c2dd4898fba42cc 100644 (file)
--- a/magick/studio.h
+++ b/magick/studio.h
@@ -69,16 +69,16 @@ extern "C" {
 # define _FILE_OFFSET_BITS MAGICKCORE__FILE_OFFSET_BITS
 #endif
 #if defined(_magickcore_const) && !defined(const)
-# define const _magickcore_const
+# define const  _magickcore_const
 #endif
 #if defined(_magickcore_inline) && !defined(inline)
-# define inline _magickcore_inline
+# define inline  _magickcore_inline
 #endif
 # if defined(__cplusplus) || defined(c_plusplus)
 #  undef inline
 # endif
-#if defined(_magickcore_restrict) && !defined(__restrict)
-# define __restrict _magickcore_restrict
+#if defined(_magickcore_restrict) && !defined(restrict)
+# define restrict  _magickcore_restrict
 #endif
 #endif
 

diff --git a/magick/threshold.c b/magick/threshold.c
index 1a57b055d465c4d5da76073139d577534517b496..2c07fb1cb6bfd5e6f0062d41060500091a5f8f05 100644 (file)
--- a/magick/threshold.c
+++ b/magick/threshold.c
@@ -200,19 +200,19 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image,
       sync;
 
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict threshold_indexes;
+      *restrict threshold_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -391,13 +391,13 @@ MagickExport MagickBooleanType BilevelImageChannel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -577,13 +577,13 @@ MagickExport MagickBooleanType BlackThresholdImageChannel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -726,7 +726,7 @@ MagickExport MagickBooleanType ClampImageChannel(Image *image,
         i;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       q=image->colormap;
       for (i=0; i < (long) image->colors; i++)
@@ -752,13 +752,13 @@ MagickExport MagickBooleanType ClampImageChannel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -1482,13 +1482,13 @@ printf("DEBUG levels  r=%ld g=%ld b=%ld a=%ld i=%ld\n",
     for (y=0; y < (long) image->rows; y++)
     {
       register IndexPacket
-        *__restrict indexes;
+        *restrict indexes;
 
       register long
         x;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       if (status == MagickFalse)
         continue;
@@ -1704,14 +1704,14 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image,
           sync;
 
         register IndexPacket
-          *__restrict indexes;
+          *restrict indexes;
 
         register long
           id,
           x;
 
         register PixelPacket
-          *__restrict q;
+          *restrict q;
 
         if (status == MagickFalse)
           continue;
@@ -1778,14 +1778,14 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       id,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -2005,13 +2005,13 @@ MagickExport MagickBooleanType WhiteThresholdImageChannel(Image *image,
   for (y=0; y < (long) image->rows; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;

diff --git a/magick/transform.c b/magick/transform.c
index 0df324c02e73f8f5c2deff10336e2d984a435932..c033e1f44e4ac0c5e9e36bbfec4d5409930affad 100644 (file)
--- a/magick/transform.c
+++ b/magick/transform.c
@@ -161,17 +161,17 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info,
   for (y=0; y < (long) extent.y; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict chop_indexes,
-      *__restrict indexes;
+      *restrict chop_indexes,
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     p=GetCacheViewVirtualPixels(image_view,0,i++,image->columns,1,exception);
     q=QueueCacheViewAuthenticPixels(chop_view,0,j++,chop_image->columns,1,
@@ -207,17 +207,17 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info,
   for (y=0; y < (long) (image->rows-(extent.y+extent.height)); y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict chop_indexes,
-      *__restrict indexes;
+      *restrict chop_indexes,
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     p=GetCacheViewVirtualPixels(image_view,0,i++,image->columns,1,exception);
     q=QueueCacheViewAuthenticPixels(chop_view,0,j++,chop_image->columns,1,
@@ -312,13 +312,13 @@ MagickExport Image *ConsolidateCMYKImages(const Image *images,
     for (y=0; y < (long) images->rows; y++)
     {
       register const PixelPacket
-        *__restrict p;
+        *restrict p;
 
       register long
         x;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       p=GetVirtualPixels(images,0,y,images->columns,1,exception);
       q=QueueAuthenticPixels(cmyk_image,0,y,cmyk_image->columns,1,exception);
@@ -339,13 +339,13 @@ MagickExport Image *ConsolidateCMYKImages(const Image *images,
     for (y=0; y < (long) images->rows; y++)
     {
       register const PixelPacket
-        *__restrict p;
+        *restrict p;
 
       register long
         x;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       p=GetVirtualPixels(images,0,y,images->columns,1,exception);
       q=GetAuthenticPixels(cmyk_image,0,y,cmyk_image->columns,1,exception);
@@ -366,13 +366,13 @@ MagickExport Image *ConsolidateCMYKImages(const Image *images,
     for (y=0; y < (long) images->rows; y++)
     {
       register const PixelPacket
-        *__restrict p;
+        *restrict p;
 
       register long
         x;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       p=GetVirtualPixels(images,0,y,images->columns,1,exception);
       q=GetAuthenticPixels(cmyk_image,0,y,cmyk_image->columns,1,exception);
@@ -393,16 +393,16 @@ MagickExport Image *ConsolidateCMYKImages(const Image *images,
     for (y=0; y < (long) images->rows; y++)
     {
       register const PixelPacket
-        *__restrict p;
+        *restrict p;
 
       register IndexPacket
-        *__restrict indexes;
+        *restrict indexes;
 
       register long
         x;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       p=GetVirtualPixels(images,0,y,images->columns,1,exception);
       q=GetAuthenticPixels(cmyk_image,0,y,cmyk_image->columns,1,exception);
@@ -591,16 +591,16 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry,
   for (y=0; y < (long) crop_image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict crop_indexes;
+      *restrict crop_indexes;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -719,14 +719,14 @@ MagickExport Image *ExcerptImage(const Image *image,
   for (y=0; y < (long) excerpt_image->rows; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict excerpt_indexes,
-      *__restrict indexes;
+      *restrict excerpt_indexes,
+      *restrict indexes;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -900,16 +900,16 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception)
   for (y=0; y < (long) flip_image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict flip_indexes;
+      *restrict flip_indexes;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -1018,19 +1018,19 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception)
   for (y=0; y < (long) flop_image->rows; y++)
   {
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict flop_indexes;
+      *restrict flop_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -1132,17 +1132,17 @@ static inline MagickBooleanType CopyImageRegion(Image *destination,
       sync;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict indexes,
-      *__restrict destination_indexes;
+      *restrict indexes,
+      *restrict destination_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     /*
       Transfer scanline.
@@ -1444,17 +1444,17 @@ MagickExport Image *SpliceImage(const Image *image,
   for (y=0; y < (long) splice_geometry.y; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict indexes,
-      *__restrict splice_indexes;
+      *restrict indexes,
+      *restrict splice_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -1520,17 +1520,17 @@ MagickExport Image *SpliceImage(const Image *image,
        y < (long) splice_image->rows; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict indexes,
-      *__restrict splice_indexes;
+      *restrict indexes,
+      *restrict splice_indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -1881,14 +1881,14 @@ MagickExport Image *TransposeImage(const Image *image,ExceptionInfo *exception)
   for (y=0; y < (long) image->rows; y++)
   {
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict transpose_indexes,
-      *__restrict indexes;
+      *restrict transpose_indexes,
+      *restrict indexes;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;
@@ -2012,17 +2012,17 @@ MagickExport Image *TransverseImage(const Image *image,ExceptionInfo *exception)
       sync;
 
     register const PixelPacket
-      *__restrict p;
+      *restrict p;
 
     register IndexPacket
-      *__restrict transverse_indexes,
-      *__restrict indexes;
+      *restrict transverse_indexes,
+      *restrict indexes;
 
     register long
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     if (status == MagickFalse)
       continue;

diff --git a/magick/xwindow.c b/magick/xwindow.c
index 1c11af0278d0a8b1f4e8f566d7acaee8288a58a3..b5b845dd4ec7795dc49f3b8fdd4e9567ee06949a 100644 (file)
--- a/magick/xwindow.c
+++ b/magick/xwindow.c
@@ -547,7 +547,7 @@ MagickExport MagickBooleanType XAnnotateImage(Display *display,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=GetAuthenticPixels(annotate_image,0,y,annotate_image->columns,1,
       exception);
@@ -2468,7 +2468,7 @@ MagickExport MagickBooleanType XDrawImage(Display *display,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=QueueAuthenticPixels(draw_image,0,y,draw_image->columns,1,exception);
     if (q == (PixelPacket *) NULL)
@@ -2587,7 +2587,7 @@ MagickExport MagickBooleanType XDrawImage(Display *display,
       x;
 
     register PixelPacket
-      *__restrict q;
+      *restrict q;
 
     q=GetAuthenticPixels(draw_image,0,y,draw_image->columns,1,exception);
     if (q == (PixelPacket *) NULL)
@@ -4150,7 +4150,7 @@ static Image *XGetWindowImage(Display *display,const Window window,
         x;
 
       register PixelPacket
-        *__restrict q;
+        *restrict q;
 
       register unsigned long
         pixel;
@@ -7681,7 +7681,7 @@ MagickExport void XMakeStandardColormap(Display *display,
               *affinity_image;
 
             register PixelPacket
-              *__restrict q;
+              *restrict q;
 
             /*
               Improve image appearance with error diffusion.
@@ -7890,7 +7890,7 @@ MagickExport void XMakeStandardColormap(Display *display,
               x;
 
             register PixelPacket
-              *__restrict q;
+              *restrict q;
 
             q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
             if (q == (PixelPacket *) NULL)

diff --git a/wand/mogrify.c b/wand/mogrify.c
index 03ca32e3e01fb5837a46b22488b9c607dd5d7cf8..4f1b36acfa4698903402fc73d71f504bdda0a3d6 100644 (file)
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -1052,7 +1052,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
               x;
 
             register PixelPacket
-              *__restrict q;
+              *restrict q;
 
             (void) SyncImageSettings(image_info,*image);
             if (*option == '+')

diff --git a/wand/pixel-iterator.c b/wand/pixel-iterator.c
index 7151dcd562f3d1c1164211549126a14a6aeccbdf..691d33bb8667d438268f81e3082b11fb616716df 100644 (file)
--- a/wand/pixel-iterator.c
+++ b/wand/pixel-iterator.c
@@ -949,13 +949,13 @@ WandExport MagickBooleanType PixelSyncIterator(PixelIterator *iterator)
     *exception;
 
   register IndexPacket
-    *__restrict indexes;
+    *restrict indexes;
 
   register long
     x;
 
   register PixelPacket
-    *__restrict pixels;
+    *restrict pixels;
 
   assert(iterator != (const PixelIterator *) NULL);
   assert(iterator->signature == WandSignature);

diff --git a/wand/pixel-view.c b/wand/pixel-view.c
index 107bbf2e928c8ae2d1a18e0a3540ff3441da2645..01dd2f87d057f1ccbde87db0e265b1a49a134894 100644 (file)
--- a/wand/pixel-view.c
+++ b/wand/pixel-view.c
@@ -293,22 +293,22 @@ WandExport MagickBooleanType DuplexTransferPixelViewIterator(
       sync;
 
     register const IndexPacket
-      *__restrict duplex_indexes,
-      *__restrict indexes;
+      *restrict duplex_indexes,
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict duplex_pixels,
-      *__restrict pixels;
+      *restrict duplex_pixels,
+      *restrict pixels;
 
     register IndexPacket
-      *__restrict destination_indexes;
+      *restrict destination_indexes;
 
     register long
       id,
       x;
 
     register PixelPacket
-      *__restrict destination_pixels;
+      *restrict destination_pixels;
 
     if (status == MagickFalse)
       continue;
@@ -999,14 +999,14 @@ WandExport MagickBooleanType SetPixelViewIterator(PixelView *destination,
       sync;
 
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       id,
       x;
 
     register PixelPacket
-      *__restrict pixels;
+      *restrict pixels;
 
     if (status == MagickFalse)
       continue;
@@ -1133,20 +1133,20 @@ WandExport MagickBooleanType TransferPixelViewIterator(PixelView *source,
       sync;
 
     register const IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register const PixelPacket
-      *__restrict pixels;
+      *restrict pixels;
 
     register IndexPacket
-      *__restrict destination_indexes;
+      *restrict destination_indexes;
 
     register long
       id,
       x;
 
     register PixelPacket
-      *__restrict destination_pixels;
+      *restrict destination_pixels;
 
     if (status == MagickFalse)
       continue;
@@ -1288,14 +1288,14 @@ WandExport MagickBooleanType UpdatePixelViewIterator(PixelView *source,
   for (y=source->region.y; y < (long) source->region.height; y++)
   {
     register IndexPacket
-      *__restrict indexes;
+      *restrict indexes;
 
     register long
       id,
       x;
 
     register PixelPacket
-      *__restrict pixels;
+      *restrict pixels;
 
     if (status == MagickFalse)
       continue;