diff --git a/coders/art.c b/coders/art.c
index 8086510..d13c98d 100644
--- a/coders/art.c
+++ b/coders/art.c
@@ -163,7 +163,7 @@
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 78989b0..576e3c3 100644
--- a/coders/cmyk.c
+++ b/coders/cmyk.c
@@ -218,19 +218,19 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 440d0c7..003d232 100644
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -412,13 +412,13 @@
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 @@
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 a3e9139..2169bd6 100644
--- a/coders/gray.c
+++ b/coders/gray.c
@@ -200,13 +200,13 @@
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 @@
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 95a028a..af56cc6 100644
--- a/coders/hald.c
+++ b/coders/hald.c
@@ -136,7 +136,7 @@
red;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
diff --git a/coders/jpeg.c b/coders/jpeg.c
index c64b380..70c188b 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1154,13 +1154,13 @@
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 80a37c2..ade4d78 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -1222,13 +1222,13 @@
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 @@
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 e8b0fdf..65699a2 100644
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -434,7 +434,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (PixelPacket *) NULL)
@@ -485,7 +485,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (PixelPacket *) NULL)
@@ -542,7 +542,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (PixelPacket *) NULL)
@@ -605,7 +605,7 @@
sync;
register PixelPacket
- *__restrict q;
+ *restrict q;
ssize_t
count;
@@ -693,7 +693,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
ssize_t
count;
@@ -811,7 +811,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
ssize_t
count;
@@ -866,7 +866,7 @@
pixel;
register PixelPacket
- *__restrict r;
+ *restrict r;
r=q;
for (x=0; x < (long) image->columns; x++)
@@ -886,7 +886,7 @@
pixel;
register PixelPacket
- *__restrict r;
+ *restrict r;
r=q;
for (x=0; x < (long) image->columns; x++)
@@ -985,7 +985,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
ssize_t
count;
@@ -1222,7 +1222,7 @@
sync;
register PixelPacket
- *__restrict q;
+ *restrict q;
ssize_t
count;
@@ -1669,10 +1669,10 @@
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 @@
for (y=0; y < (long) image->rows; y++)
{
register const PixelPacket
- *__restrict p;
+ *restrict p;
register long
x;
@@ -1784,7 +1784,7 @@
for (y=0; y < (long) image->rows; y++)
{
register const PixelPacket
- *__restrict p;
+ *restrict p;
register long
x;
@@ -1841,7 +1841,7 @@
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 @@
for (y=0; y < (long) image->rows; y++)
{
register const PixelPacket
- *__restrict p;
+ *restrict p;
register long
x;
@@ -1965,7 +1965,7 @@
for (y=0; y < (long) image->rows; y++)
{
register const PixelPacket
- *__restrict p;
+ *restrict p;
register long
x;
@@ -2044,10 +2044,10 @@
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 @@
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 dfa92f4..c6b223d 100644
--- a/coders/raw.c
+++ b/coders/raw.c
@@ -198,13 +198,13 @@
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 47b1a52..519b2f5 100644
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -247,13 +247,13 @@
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 @@
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 @@
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 @@
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 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
&image->exception);
@@ -922,7 +922,7 @@
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 @@
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 @@
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 4acc425..a8871b0 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1221,7 +1221,7 @@
status;
register PixelPacket
- *__restrict q;
+ *restrict q;
status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) pixels);
if (status == -1)
@@ -1274,7 +1274,7 @@
status;
register PixelPacket
- *__restrict q;
+ *restrict q;
status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) pixels);
if (status == -1)
@@ -1305,7 +1305,7 @@
for (y=0; y < (long) image->rows; y++)
{
register PixelPacket
- *__restrict q;
+ *restrict q;
int
status;
@@ -1366,7 +1366,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (PixelPacket *) NULL)
@@ -1440,7 +1440,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
unsigned long
columns_remaining,
@@ -1542,7 +1542,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (PixelPacket *) NULL)
@@ -2948,7 +2948,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 39d9e42..e429aa9 100644
--- a/magick/annotate.c
+++ b/magick/annotate.c
@@ -1273,7 +1273,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
register unsigned char
*p;
@@ -1684,7 +1684,7 @@
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 52ac659..2cab5e7 100644
--- a/magick/attribute.c
+++ b/magick/attribute.c
@@ -180,10 +180,10 @@
bounding_box;
register const IndexPacket
- *__restrict indexes;
+ *restrict indexes;
register const PixelPacket
- *__restrict p;
+ *restrict p;
register long
x;
@@ -318,7 +318,7 @@
if ((image->storage_class == PseudoClass) && (image->matte == MagickFalse))
{
register const PixelPacket
- *__restrict p;
+ *restrict p;
register long
i;
@@ -371,10 +371,10 @@
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 @@
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 @@
i;
register PixelPacket
- *__restrict p;
+ *restrict p;
p=image->colormap;
range=GetQuantumRange(depth);
diff --git a/magick/cache.c b/magick/cache.c
index d90c754..20f1893 100644
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -362,18 +362,18 @@
**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 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 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 @@
y;
register PixelPacket
- *__restrict pixels;
+ *restrict pixels;
unsigned long
columns,
@@ -991,8 +991,8 @@
y;
register PixelPacket
- *__restrict pixels,
- *__restrict q;
+ *restrict pixels,
+ *restrict q;
unsigned long
columns,
@@ -1103,8 +1103,8 @@
y;
register PixelPacket
- *__restrict p,
- *__restrict pixels;
+ *restrict p,
+ *restrict pixels;
unsigned long
columns,
@@ -1250,8 +1250,8 @@
y;
register PixelPacket
- *__restrict pixels,
- *__restrict source_pixels;
+ *restrict pixels,
+ *restrict source_pixels;
size_t
length;
@@ -3158,20 +3158,20 @@
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 @@
**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 @@
number_pixels;
register IndexPacket
- *__restrict q;
+ *restrict q;
register long
y;
@@ -4530,7 +4530,7 @@
case MapCache:
{
register IndexPacket
- *__restrict p;
+ *restrict p;
/*
Read indexes from memory.
@@ -4627,7 +4627,7 @@
y;
register PixelPacket
- *__restrict q;
+ *restrict q;
unsigned long
rows;
@@ -4655,7 +4655,7 @@
case MapCache:
{
register PixelPacket
- *__restrict p;
+ *restrict p;
/*
Read pixels from memory.
@@ -5207,7 +5207,7 @@
number_pixels;
register const IndexPacket
- *__restrict p;
+ *restrict p;
register long
y;
@@ -5240,7 +5240,7 @@
case MapCache:
{
register IndexPacket
- *__restrict q;
+ *restrict q;
/*
Write indexes to memory.
@@ -5338,7 +5338,7 @@
y;
register const PixelPacket
- *__restrict p;
+ *restrict p;
unsigned long
rows;
@@ -5366,7 +5366,7 @@
case MapCache:
{
register PixelPacket
- *__restrict q;
+ *restrict q;
/*
Write pixels to memory.
diff --git a/magick/cipher.c b/magick/cipher.c
index 26d5db1..6ca5d72 100644
--- a/magick/cipher.c
+++ b/magick/cipher.c
@@ -651,7 +651,7 @@
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 @@
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 97c3343..40f569d 100644
--- a/magick/colormap.c
+++ b/magick/colormap.c
@@ -127,13 +127,13 @@
index;
register IndexPacket
- *__restrict indexes;
+ *restrict indexes;
register long
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -277,10 +277,10 @@
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 eb5ae73..584d495 100644
--- a/magick/colorspace.c
+++ b/magick/colorspace.c
@@ -232,7 +232,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -285,13 +285,13 @@
pixel;
register IndexPacket
- *__restrict indexes;
+ *restrict indexes;
register long
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -347,7 +347,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -403,7 +403,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -459,7 +459,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -518,7 +518,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -610,7 +610,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -1018,7 +1018,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
register unsigned long
blue,
@@ -1431,7 +1431,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -1487,13 +1487,13 @@
pixel;
register IndexPacket
- *__restrict indexes;
+ *restrict indexes;
register long
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -1552,7 +1552,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -1610,7 +1610,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -1668,7 +1668,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -1729,7 +1729,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -1822,7 +1822,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -2192,7 +2192,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
diff --git a/magick/compare.c b/magick/compare.c
index 6e05119..ddb6ed3 100644
--- a/magick/compare.c
+++ b/magick/compare.c
@@ -210,21 +210,21 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
diff --git a/magick/composite.c b/magick/composite.c
index 02b9462..96f6035 100644
--- a/magick/composite.c
+++ b/magick/composite.c
@@ -1513,13 +1513,13 @@
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 @@
y_lookup;
register IndexPacket
- *__restrict destination_indexes;
+ *restrict destination_indexes;
register PixelPacket
- *__restrict r;
+ *restrict r;
ResampleFilter
*resample_filter;
@@ -1682,7 +1682,7 @@
sync;
register const PixelPacket
- *__restrict p;
+ *restrict p;
register long
x;
@@ -1863,19 +1863,19 @@
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 dba307c..46efa35 100644
--- a/magick/compress.c
+++ b/magick/compress.c
@@ -515,7 +515,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
/*
Initialize scanline to white.
diff --git a/magick/decorate.c b/magick/decorate.c
index d2c05b3..70ad84a 100644
--- a/magick/decorate.c
+++ b/magick/decorate.c
@@ -289,13 +289,13 @@
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 @@
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 @@
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 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -797,7 +797,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -853,7 +853,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
diff --git a/magick/deprecate.c b/magick/deprecate.c
index 438c84f..36f07eb 100644
--- a/magick/deprecate.c
+++ b/magick/deprecate.c
@@ -1102,13 +1102,13 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 bd54948..eca27df 100644
--- a/magick/distort.c
+++ b/magick/distort.c
@@ -1961,14 +1961,14 @@
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 @@
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 7ee80b8..4280d7d 100644
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -1184,14 +1184,14 @@
point;
register IndexPacket
- *__restrict indexes;
+ *restrict indexes;
register long
id,
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
SegmentInfo
inverse_edge;
@@ -3289,14 +3289,14 @@
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 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -3945,7 +3945,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -4203,7 +4203,7 @@
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 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
@@ -4313,7 +4313,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
@@ -4368,7 +4368,7 @@
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 65111ae..293c824 100644
--- a/magick/effect.c
+++ b/magick/effect.c
@@ -273,20 +273,20 @@
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 @@
gamma;
register const double
- *__restrict k;
+ *restrict k;
register long
i,
@@ -590,20 +590,20 @@
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 @@
gamma;
register const double
- *__restrict k;
+ *restrict k;
register long
i,
@@ -908,19 +908,19 @@
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 @@
pixel;
register const double
- *__restrict k;
+ *restrict k;
register const PixelPacket
- *__restrict kernel_pixels;
+ *restrict kernel_pixels;
register long
i;
@@ -984,7 +984,7 @@
(image->colorspace == CMYKColorspace))
{
register const IndexPacket
- *__restrict kernel_indexes;
+ *restrict kernel_indexes;
k=kernel;
kernel_indexes=indexes;
@@ -1038,7 +1038,7 @@
(image->colorspace == CMYKColorspace))
{
register const IndexPacket
- *__restrict kernel_indexes;
+ *restrict kernel_indexes;
k=kernel;
kernel_pixels=p;
@@ -1087,19 +1087,19 @@
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 @@
pixel;
register const double
- *__restrict k;
+ *restrict k;
register const PixelPacket
- *__restrict kernel_pixels;
+ *restrict kernel_pixels;
register long
i;
@@ -1162,7 +1162,7 @@
(image->colorspace == CMYKColorspace))
{
register const IndexPacket
- *__restrict kernel_indexes;
+ *restrict kernel_indexes;
k=kernel;
kernel_indexes=indexes;
@@ -1216,7 +1216,7 @@
(image->colorspace == CMYKColorspace))
{
register const IndexPacket
- *__restrict kernel_indexes;
+ *restrict kernel_indexes;
k=kernel;
kernel_pixels=p;
@@ -1521,7 +1521,7 @@
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 @@
sync;
register PixelPacket
- *__restrict q;
+ *restrict q;
q=GetCacheViewAuthenticPixels(despeckle_view,0,y,despeckle_image->columns,
1,exception);
@@ -2244,20 +2244,20 @@
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 @@
pixel;
register const PixelPacket
- *__restrict r;
+ *restrict r;
register const IndexPacket
- *__restrict s;
+ *restrict s;
register long
u,
@@ -2516,13 +2516,13 @@
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 @@
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 @@
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 @@
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 @@
pixel;
register const PixelPacket
- *__restrict r;
+ *restrict r;
register const IndexPacket
- *__restrict s;
+ *restrict s;
register long
u,
@@ -3862,19 +3862,19 @@
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 @@
pixel;
register const double
- *__restrict k;
+ *restrict k;
register long
u;
@@ -4200,16 +4200,16 @@
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 @@
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 @@
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 2e979ad..f3ddf60 100644
--- a/magick/enhance.c
+++ b/magick/enhance.c
@@ -517,7 +517,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -662,14 +662,14 @@
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 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -1064,10 +1064,10 @@
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 @@
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 @@
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 @@
pixel;
register const PixelPacket
- *__restrict r;
+ *restrict r;
/*
Compute weighted average of target pixel color components.
@@ -1704,10 +1704,10 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
for (y=0; y < (long) image->rows; y++)
{
register const PixelPacket
- *__restrict p;
+ *restrict p;
register long
x;
@@ -3167,7 +3167,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -3331,13 +3331,13 @@
sync;
register IndexPacket
- *__restrict indexes;
+ *restrict indexes;
register long
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -3398,13 +3398,13 @@
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 @@
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 f4a5713..b9de419 100644
--- a/magick/fx.c
+++ b/magick/fx.c
@@ -342,20 +342,20 @@
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 @@
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 @@
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 @@
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 @@
pixel;
register const double
- *__restrict k;
+ *restrict k;
register const PixelPacket
- *__restrict kernel_pixels;
+ *restrict kernel_pixels;
register long
u;
@@ -1051,7 +1051,7 @@
(image->colorspace == CMYKColorspace))
{
register const IndexPacket
- *__restrict kernel_indexes;
+ *restrict kernel_indexes;
k=normal_kernel;
kernel_indexes=indexes;
@@ -1115,7 +1115,7 @@
(image->colorspace == CMYKColorspace))
{
register const IndexPacket
- *__restrict kernel_indexes;
+ *restrict kernel_indexes;
k=normal_kernel;
kernel_pixels=p;
@@ -1478,14 +1478,14 @@
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 @@
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 @@
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 @@
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 @@
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 @@
if ((segment->x1 != (double) x_mid) || (segment->x2 != (double) x_mid))
{
register PixelPacket
- *__restrict q;
+ *restrict q;
/*
Left pixel.
@@ -4200,7 +4200,7 @@
if ((segment->x1 != (double) x_mid) || (segment->y2 != (double) y_mid))
{
register PixelPacket
- *__restrict q;
+ *restrict q;
/*
Bottom pixel.
@@ -4224,7 +4224,7 @@
if (segment->y1 != segment->y2)
{
register PixelPacket
- *__restrict q;
+ *restrict q;
/*
Top pixel.
@@ -4249,7 +4249,7 @@
if ((segment->x1 != segment->x2) || (segment->y1 != segment->y2))
{
register PixelPacket
- *__restrict q;
+ *restrict q;
/*
Middle pixel.
@@ -4592,22 +4592,22 @@
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 @@
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 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -5116,13 +5116,13 @@
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 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -5560,14 +5560,14 @@
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 @@
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 @@
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 @@
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 54bde2b..b458f5b 100644
--- a/magick/histogram.c
+++ b/magick/histogram.c
@@ -1227,10 +1227,10 @@
*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 bf810dd..4c1e402 100644
--- a/magick/identify.c
+++ b/magick/identify.c
@@ -581,7 +581,7 @@
pixel;
register PixelPacket
- *__restrict p;
+ *restrict p;
GetMagickPixelPacket(image,&pixel);
p=image->colormap;
diff --git a/magick/image.c b/magick/image.c
index 4a02eba..58352f3 100644
--- a/magick/image.c
+++ b/magick/image.c
@@ -560,19 +560,19 @@
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 @@
*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 @@
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 @@
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 @@
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 @@
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 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -3814,13 +3814,13 @@
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 b7c686b..c3eda2d 100644
--- a/magick/layer.c
+++ b/magick/layer.c
@@ -111,7 +111,7 @@
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 ad219d9..d74e44c 100644
--- a/magick/mac.c
+++ b/magick/mac.c
@@ -1350,13 +1350,13 @@
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 89e71aa..605630f 100644
--- a/magick/paint.c
+++ b/magick/paint.c
@@ -206,16 +206,16 @@
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 @@
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 @@
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 @@
pixel;
register IndexPacket
- *__restrict indexes;
+ *restrict indexes;
register long
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -940,13 +940,13 @@
pixel;
register IndexPacket
- *__restrict indexes;
+ *restrict indexes;
register long
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -1073,13 +1073,13 @@
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 4597691..98309ed 100644
--- a/magick/profile.c
+++ b/magick/profile.c
@@ -1159,14 +1159,14 @@
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 0f124c5..f5c2a7c 100644
--- a/magick/quantize.c
+++ b/magick/quantize.c
@@ -542,10 +542,10 @@
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 @@
intensity;
register PixelPacket
- *__restrict q;
+ *restrict q;
/*
Monochrome image.
@@ -763,7 +763,7 @@
for (y=0; y < (long) image->rows; y++)
{
register const PixelPacket
- *__restrict p;
+ *restrict p;
register long
x;
@@ -851,7 +851,7 @@
for (y++; y < (long) image->rows; y++)
{
register const PixelPacket
- *__restrict p;
+ *restrict p;
register long
x;
@@ -1040,10 +1040,10 @@
distance;
register PixelPacket
- *__restrict p;
+ *restrict p;
register RealPixelPacket
- *__restrict q;
+ *restrict q;
/*
Determine if this color is "closest".
@@ -1175,7 +1175,7 @@
alpha;
register PixelPacket
- *__restrict q;
+ *restrict q;
/*
Colormap entry is defined by the mean color in this cube.
@@ -1386,14 +1386,14 @@
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 @@
*exception;
register IndexPacket
- *__restrict indexes;
+ *restrict indexes;
register long
i;
register PixelPacket
- *__restrict q;
+ *restrict q;
/*
Distribute error.
@@ -2048,7 +2048,7 @@
for (y=0; y < (long) image->rows; y++)
{
register const PixelPacket
- *__restrict p;
+ *restrict p;
register long
x;
@@ -2185,7 +2185,7 @@
i;
register PixelPacket
- *__restrict q;
+ *restrict q;
CacheView
*posterize_view;
@@ -3028,13 +3028,13 @@
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 @@
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 dc20c21..8eade97 100644
--- a/magick/quantum-export.c
+++ b/magick/quantum-export.c
@@ -289,7 +289,7 @@
if (quantum_info->alpha_type == AssociatedQuantumAlpha)
{
register PixelPacket
- *__restrict q;
+ *restrict q;
/*
Associate alpha.
@@ -309,7 +309,7 @@
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 @@
quantum;
register PixelPacket
- *__restrict q;
+ *restrict q;
q=GetAuthenticPixelQueue(image);
if (image_view != (CacheView *) NULL)
@@ -2329,7 +2329,7 @@
quantum;
register PixelPacket
- *__restrict q;
+ *restrict q;
q=GetAuthenticPixelQueue(image);
if (image_view != (CacheView *) NULL)
@@ -2345,7 +2345,7 @@
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 5293429..9d705aa 100644
--- a/magick/quantum-import.c
+++ b/magick/quantum-import.c
@@ -273,13 +273,13 @@
*p;
register IndexPacket
- *indexes;
+ *restrict indexes;
register long
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
size_t
extent;
@@ -2474,7 +2474,7 @@
quantum;
register PixelPacket
- *__restrict q;
+ *restrict q;
q=GetAuthenticPixelQueue(image);
if (image_view != (CacheView *) NULL)
@@ -2490,7 +2490,7 @@
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 @@
alpha;
register PixelPacket
- *__restrict q;
+ *restrict q;
/*
Disassociate alpha.
diff --git a/magick/resize.c b/magick/resize.c
index 0c69172..012c7fa 100644
--- a/magick/resize.c
+++ b/magick/resize.c
@@ -841,13 +841,13 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 06bd425..b3e9830 100644
--- a/magick/segment.c
+++ b/magick/segment.c
@@ -528,16 +528,16 @@
*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 d445e73..8b470fc 100644
--- a/magick/shear.c
+++ b/magick/shear.c
@@ -712,7 +712,7 @@
for (y=0; y < (long) image->rows; y++)
{
register const PixelPacket
- *__restrict p;
+ *restrict p;
register long
i,
@@ -763,7 +763,7 @@
for (y=0; y < (long) image->rows; y++)
{
register const PixelPacket
- *__restrict p;
+ *restrict p;
register long
i,
@@ -839,7 +839,7 @@
for (y=0; y < (long) image->rows; y++)
{
register const PixelPacket
- *__restrict p;
+ *restrict p;
register long
x;
@@ -1090,19 +1090,19 @@
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 @@
for (y=0; y < (long) width; y++)
{
register const PixelPacket
- *__restrict tile_pixels;
+ *restrict tile_pixels;
register long
x;
@@ -1151,7 +1151,7 @@
(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 @@
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 @@
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 @@
for (y=0; y < (long) width; y++)
{
register const PixelPacket
- *__restrict tile_pixels;
+ *restrict tile_pixels;
register long
x;
@@ -1340,7 +1340,7 @@
(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 @@
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 @@
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 95cb75e..1dffd9e 100644
--- a/magick/statistic.c
+++ b/magick/statistic.c
@@ -242,7 +242,7 @@
pixel;
register IndexPacket
- *__restrict average_indexes;
+ *restrict average_indexes;
register long
i,
@@ -253,7 +253,7 @@
*average_pixel;
register PixelPacket
- *__restrict q;
+ *restrict q;
if (status == MagickFalse)
continue;
@@ -465,10 +465,10 @@
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 @@
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 @@
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 @@
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 5d4c719..8395650 100644
--- a/magick/studio.h
+++ b/magick/studio.h
@@ -69,16 +69,16 @@
# 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 1a57b05..2c07fb1 100644
--- a/magick/threshold.c
+++ b/magick/threshold.c
@@ -200,19 +200,19 @@
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 @@
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 @@
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 @@
i;
register PixelPacket
- *__restrict q;
+ *restrict q;
q=image->colormap;
for (i=0; i < (long) image->colors; i++)
@@ -752,13 +752,13 @@
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 @@
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 @@
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 @@
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 @@
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 0df324c..c033e1f 100644
--- a/magick/transform.c
+++ b/magick/transform.c
@@ -161,17 +161,17 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 1c11af0..b5b845d 100644
--- a/magick/xwindow.c
+++ b/magick/xwindow.c
@@ -547,7 +547,7 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
q=GetAuthenticPixels(annotate_image,0,y,annotate_image->columns,1,
exception);
@@ -2468,7 +2468,7 @@
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 @@
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 @@
x;
register PixelPacket
- *__restrict q;
+ *restrict q;
register unsigned long
pixel;
@@ -7681,7 +7681,7 @@
*affinity_image;
register PixelPacket
- *__restrict q;
+ *restrict q;
/*
Improve image appearance with error diffusion.
@@ -7890,7 +7890,7 @@
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 03ca32e..4f1b36a 100644
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -1052,7 +1052,7 @@
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 7151dcd..691d33b 100644
--- a/wand/pixel-iterator.c
+++ b/wand/pixel-iterator.c
@@ -949,13 +949,13 @@
*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 107bbf2..01dd2f8 100644
--- a/wand/pixel-view.c
+++ b/wand/pixel-view.c
@@ -293,22 +293,22 @@
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 @@
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 @@
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 @@
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;