diff options
244 files changed, 3062 insertions, 3062 deletions
diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c index 334e3ff55..fbdfaa4a0 100644 --- a/MagickCore/accelerate.c +++ b/MagickCore/accelerate.c @@ -330,7 +330,7 @@ static MagickBooleanType LaunchHistogramKernel(MagickCLEnv clEnv, colorspace, method; - register ssize_t + ssize_t i; size_t @@ -1000,7 +1000,7 @@ static MagickBooleanType ComputeContrastStretchImage(Image *image, PixelPacket *stretch_map; - register ssize_t + ssize_t i; size_t @@ -2321,7 +2321,7 @@ static MagickBooleanType ComputeEqualizeImage(Image *image,MagickCLEnv clEnv, PixelPacket *equalize_map; - register ssize_t + ssize_t i; size_t @@ -3398,7 +3398,7 @@ static MagickBooleanType ComputeModulateImage(Image *image,MagickCLEnv clEnv, MagickSizeType length; - register ssize_t + ssize_t i; void diff --git a/MagickCore/animate.c b/MagickCore/animate.c index 94128e0be..edbe8737d 100644 --- a/MagickCore/animate.c +++ b/MagickCore/animate.c @@ -404,7 +404,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, int number_files; - register int + int i; static char @@ -753,7 +753,7 @@ MagickExport void XAnimateBackgroundImage(Display *display, RectangleInfo geometry_info; - register ssize_t + ssize_t i; size_t @@ -1340,10 +1340,10 @@ MagickExport Image *XAnimateImages(Display *display, RectangleInfo geometry_info; - register char + char *p; - register ssize_t + ssize_t i; ssize_t @@ -1436,7 +1436,7 @@ MagickExport Image *XAnimateImages(Display *display, } else { - register Image + Image *p; /* diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c index 3de87a6ab..ee99245e5 100644 --- a/MagickCore/annotate.c +++ b/MagickCore/annotate.c @@ -249,7 +249,7 @@ MagickExport MagickBooleanType AnnotateImage(Image *image, RectangleInfo geometry; - register ssize_t + ssize_t i; TypeMetric @@ -595,12 +595,12 @@ MagickExport ssize_t FormatMagickCaption(Image *image,DrawInfo *draw_info, MagickBooleanType status; - register char + char *p, *q, *s; - register ssize_t + ssize_t i; size_t @@ -734,7 +734,7 @@ MagickExport MagickBooleanType GetMultilineTypeMetrics(Image *image, MagickSizeType size; - register ssize_t + ssize_t i; size_t @@ -985,7 +985,7 @@ static MagickBooleanType RenderType(Image *image,const DrawInfo *draw_info, int number_families; - register ssize_t + ssize_t i; /* @@ -1104,7 +1104,7 @@ static size_t ComplexTextLayout(const Image *image,const DrawInfo *draw_info, raqm_glyph_t *glyphs; - register ssize_t + ssize_t i; size_t @@ -1182,7 +1182,7 @@ cleanup: FT_Error ft_status; - register ssize_t + ssize_t i; ssize_t @@ -1370,10 +1370,10 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info, point, resolution; - register char + char *p; - register ssize_t + ssize_t i; size_t @@ -1682,7 +1682,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info, MagickBooleanType transparent_fill; - register unsigned char + unsigned char *r; /* @@ -1707,10 +1707,10 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info, PixelInfo fill_color; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; ssize_t @@ -1901,10 +1901,10 @@ static char *EscapeParenthesis(const char *source) char *destination; - register char + char *q; - register const char + const char *p; size_t @@ -1969,7 +1969,7 @@ static MagickBooleanType RenderPostscript(Image *image, point, resolution; - register ssize_t + ssize_t i; size_t @@ -2138,10 +2138,10 @@ static MagickBooleanType RenderPostscript(Image *image, annotate_view=AcquireAuthenticCacheView(annotate_image,exception); for (y=0; y < (ssize_t) annotate_image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; q=GetCacheViewAuthenticPixels(annotate_view,0,y,annotate_image->columns, diff --git a/MagickCore/artifact.c b/MagickCore/artifact.c index 91a572c07..b9e16670b 100644 --- a/MagickCore/artifact.c +++ b/MagickCore/artifact.c @@ -155,7 +155,7 @@ MagickExport MagickBooleanType DefineImageArtifact(Image *image, key[MagickPathExtent], value[MagickPathExtent]; - register char + char *p; assert(image != (Image *) NULL); @@ -273,7 +273,7 @@ MagickExport void DestroyImageArtifacts(Image *image) MagickExport const char *GetImageArtifact(const Image *image, const char *artifact) { - register const char + const char *p; assert(image != (Image *) NULL); diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index 0f081ae60..3e1e178f4 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -157,7 +157,7 @@ static double GetEdgeBackgroundCensus(const Image *image, RectangleInfo edge_geometry; - register const Quantum + const Quantum *p; ssize_t @@ -216,7 +216,7 @@ static double GetEdgeBackgroundCensus(const Image *image, edge_view=AcquireVirtualCacheView(edge_image,exception); for (y=0; y < (ssize_t) edge_image->rows; y++) { - register ssize_t + ssize_t x; p=GetCacheViewVirtualPixels(edge_view,0,y,edge_image->columns,1,exception); @@ -405,7 +405,7 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image, RectangleInfo bounds; - register const Quantum + const Quantum *p; ssize_t @@ -455,10 +455,10 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image, RectangleInfo bounding_box; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -567,7 +567,7 @@ static PixelInfo GetEdgeBackgroundColor(const Image *image, background[4], edge_background; - register ssize_t + ssize_t i; /* @@ -596,7 +596,7 @@ static PixelInfo GetEdgeBackgroundColor(const Image *image, RectangleInfo edge_geometry; - register const Quantum + const Quantum *p; ssize_t @@ -650,7 +650,7 @@ static PixelInfo GetEdgeBackgroundColor(const Image *image, edge_view=AcquireVirtualCacheView(edge_image,exception); for (y=0; y < (ssize_t) edge_image->rows; y++) { - register ssize_t + ssize_t x; p=GetCacheViewVirtualPixels(edge_view,0,y,edge_image->columns,1, @@ -684,7 +684,7 @@ void TraceConvexHull(PointInfo *vertices,size_t number_vertices, PointInfo **chain; - register ssize_t + ssize_t i; size_t @@ -768,10 +768,10 @@ MagickExport PointInfo *GetImageConvexHull(const Image *image, n=0; for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -844,7 +844,7 @@ MagickExport size_t GetImageDepth(const Image *image,ExceptionInfo *exception) MagickBooleanType status; - register ssize_t + ssize_t i; size_t @@ -953,10 +953,10 @@ MagickExport size_t GetImageDepth(const Image *image,ExceptionInfo *exception) const int id = GetOpenMPThreadId(); - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -966,7 +966,7 @@ MagickExport size_t GetImageDepth(const Image *image,ExceptionInfo *exception) continue; for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -1005,10 +1005,10 @@ MagickExport size_t GetImageDepth(const Image *image,ExceptionInfo *exception) const int id = GetOpenMPThreadId(); - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1018,7 +1018,7 @@ MagickExport size_t GetImageDepth(const Image *image,ExceptionInfo *exception) continue; for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -1167,7 +1167,7 @@ MagickExport PointInfo *GetImageMinimumBoundingBox(Image *image, *bounding_box, *vertices; - register ssize_t + ssize_t i; size_t @@ -1207,7 +1207,7 @@ MagickExport PointInfo *GetImageMinimumBoundingBox(Image *image, min_diameter = -1.0, min_projection = 0.0; - register ssize_t + ssize_t j, k; @@ -1523,10 +1523,10 @@ MagickExport ImageType IdentifyImageGray(const Image *image, ImageType type; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; ssize_t @@ -1605,10 +1605,10 @@ MagickExport MagickBooleanType IdentifyImageMonochrome(const Image *image, MagickBooleanType bilevel; - register ssize_t + ssize_t x; - register const Quantum + const Quantum *p; ssize_t @@ -1807,10 +1807,10 @@ MagickExport MagickBooleanType IsImageOpaque(const Image *image, CacheView *image_view; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; ssize_t @@ -1900,7 +1900,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, range=GetQuantumRange(depth); if (image->storage_class == PseudoClass) { - register ssize_t + ssize_t i; #if defined(MAGICKCORE_OPENMP_SUPPORT) @@ -1931,7 +1931,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, Quantum *depth_map; - register ssize_t + ssize_t i; /* @@ -1949,10 +1949,10 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -1966,7 +1966,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -2007,10 +2007,10 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -2023,7 +2023,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) diff --git a/MagickCore/blob.c b/MagickCore/blob.c index df0eb2502..64441eea9 100644 --- a/MagickCore/blob.c +++ b/MagickCore/blob.c @@ -350,7 +350,7 @@ MagickExport MagickBooleanType BlobToFile(char *filename,const void *blob, int file; - register size_t + size_t i; ssize_t @@ -1135,7 +1135,7 @@ MagickExport void DisassociateBlob(Image *image) MagickExport MagickBooleanType DiscardBlobBytes(Image *image, const MagickSizeType length) { - register MagickOffsetType + MagickOffsetType i; size_t @@ -1402,7 +1402,7 @@ MagickExport void *FileToBlob(const char *filename,const size_t extent, MagickOffsetType offset; - register size_t + size_t i; ssize_t @@ -1586,7 +1586,7 @@ static inline ssize_t WriteBlobStream(Image *image,const size_t length, MagickSizeType extent; - register unsigned char + unsigned char *magick_restrict q; assert(image->blob != (BlobInfo *) NULL); @@ -2302,10 +2302,10 @@ MagickExport MagickBooleanType ImageToFile(Image *image,char *filename, int file; - register const unsigned char + const unsigned char *p; - register size_t + size_t i; size_t @@ -2730,7 +2730,7 @@ MagickExport MagickBooleanType InjectImageBlob(const ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t i; size_t @@ -3094,7 +3094,7 @@ MagickExport void MSBOrderLong(unsigned char *buffer,const size_t length) int c; - register unsigned char + unsigned char *p, *q; @@ -3144,7 +3144,7 @@ MagickExport void MSBOrderShort(unsigned char *p,const size_t length) int c; - register unsigned char + unsigned char *q; assert(p != (unsigned char *) NULL); @@ -3731,7 +3731,7 @@ MagickExport ssize_t ReadBlob(Image *image,const size_t length,void *data) int c; - register unsigned char + unsigned char *q; ssize_t @@ -3812,7 +3812,7 @@ MagickExport ssize_t ReadBlob(Image *image,const size_t length,void *data) { default: { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i+=count) @@ -3880,7 +3880,7 @@ MagickExport ssize_t ReadBlob(Image *image,const size_t length,void *data) int status; - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i+=count) @@ -3906,7 +3906,7 @@ MagickExport ssize_t ReadBlob(Image *image,const size_t length,void *data) break; case BlobStream: { - register const unsigned char + const unsigned char *p; if (blob_info->offset >= (MagickOffsetType) blob_info->length) @@ -3961,7 +3961,7 @@ MagickExport int ReadBlobByte(Image *image) BlobInfo *magick_restrict blob_info; - register const unsigned char + const unsigned char *p; unsigned char @@ -4105,7 +4105,7 @@ MagickExport float ReadBlobFloat(Image *image) */ MagickExport unsigned int ReadBlobLong(Image *image) { - register const unsigned char + const unsigned char *p; ssize_t @@ -4166,7 +4166,7 @@ MagickExport MagickSizeType ReadBlobLongLong(Image *image) MagickSizeType value; - register const unsigned char + const unsigned char *p; ssize_t @@ -4229,10 +4229,10 @@ MagickExport MagickSizeType ReadBlobLongLong(Image *image) */ MagickExport unsigned short ReadBlobShort(Image *image) { - register const unsigned char + const unsigned char *p; - register unsigned short + unsigned short value; ssize_t @@ -4283,10 +4283,10 @@ MagickExport unsigned short ReadBlobShort(Image *image) */ MagickExport unsigned int ReadBlobLSBLong(Image *image) { - register const unsigned char + const unsigned char *p; - register unsigned int + unsigned int value; ssize_t @@ -4371,10 +4371,10 @@ MagickExport signed int ReadBlobLSBSignedLong(Image *image) */ MagickExport unsigned short ReadBlobLSBShort(Image *image) { - register const unsigned char + const unsigned char *p; - register unsigned short + unsigned short value; ssize_t @@ -4457,10 +4457,10 @@ MagickExport signed short ReadBlobLSBSignedShort(Image *image) */ MagickExport unsigned int ReadBlobMSBLong(Image *image) { - register const unsigned char + const unsigned char *p; - register unsigned int + unsigned int value; ssize_t @@ -4507,10 +4507,10 @@ MagickExport unsigned int ReadBlobMSBLong(Image *image) */ MagickExport MagickSizeType ReadBlobMSBLongLong(Image *image) { - register const unsigned char + const unsigned char *p; - register MagickSizeType + MagickSizeType value; ssize_t @@ -4561,10 +4561,10 @@ MagickExport MagickSizeType ReadBlobMSBLongLong(Image *image) */ MagickExport unsigned short ReadBlobMSBShort(Image *image) { - register const unsigned char + const unsigned char *p; - register unsigned short + unsigned short value; ssize_t @@ -4834,7 +4834,7 @@ MagickExport char *ReadBlobString(Image *image,char *string) int c; - register ssize_t + ssize_t i; assert(image != (Image *) NULL); @@ -5602,10 +5602,10 @@ MagickExport ssize_t WriteBlob(Image *image,const size_t length, int c; - register const unsigned char + const unsigned char *p; - register unsigned char + unsigned char *q; ssize_t @@ -5684,7 +5684,7 @@ MagickExport ssize_t WriteBlob(Image *image,const size_t length, { default: { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i+=count) @@ -5745,7 +5745,7 @@ MagickExport ssize_t WriteBlob(Image *image,const size_t length, int status; - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i+=count) diff --git a/MagickCore/cache-view.c b/MagickCore/cache-view.c index 28668403d..705ad887f 100644 --- a/MagickCore/cache-view.c +++ b/MagickCore/cache-view.c @@ -708,7 +708,7 @@ MagickExport MagickBooleanType GetOneCacheViewAuthenticPixel( Quantum *magick_restrict q; - register ssize_t + ssize_t i; assert(cache_view != (CacheView *) NULL); @@ -777,10 +777,10 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualPixel( const int id = GetOpenMPThreadId(); - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t i; assert(cache_view != (CacheView *) NULL); @@ -850,7 +850,7 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualPixelInfo( const int id = GetOpenMPThreadId(); - register const Quantum + const Quantum *magick_restrict p; assert(cache_view != (CacheView *) NULL); @@ -912,7 +912,7 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualMethodPixel( const Quantum *magick_restrict p; - register ssize_t + ssize_t i; assert(cache_view != (CacheView *) NULL); diff --git a/MagickCore/cache.c b/MagickCore/cache.c index 75a2c2dd8..3bf2a23cf 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -261,7 +261,7 @@ MagickPrivate NexusInfo **AcquirePixelCacheNexus(const size_t number_threads) NexusInfo **magick_restrict nexus_info; - register ssize_t + ssize_t i; nexus_info=(NexusInfo **) MagickAssumeAligned(AcquireAlignedMemory(2* @@ -418,7 +418,7 @@ static MagickBooleanType ClipPixelCacheNexus(Image *image, CacheInfo *magick_restrict cache_info; - register Quantum + Quantum *magick_restrict p, *magick_restrict q; @@ -445,7 +445,7 @@ static MagickBooleanType ClipPixelCacheNexus(Image *image, return(MagickFalse); for (y=0; y < (ssize_t) nexus_info->region.height; y++) { - register ssize_t + ssize_t x; for (x=0; x < (ssize_t) nexus_info->region.width; x++) @@ -453,7 +453,7 @@ static MagickBooleanType ClipPixelCacheNexus(Image *image, double mask_alpha; - register ssize_t + ssize_t i; mask_alpha=QuantumScale*GetPixelWriteMask(image,p); @@ -741,7 +741,7 @@ static MagickBooleanType ClonePixelCacheRepository( Quantum *pixels; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -765,10 +765,10 @@ static MagickBooleanType ClonePixelCacheRepository( sizeof(Quantum)); else { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; /* @@ -778,7 +778,7 @@ static MagickBooleanType ClonePixelCacheRepository( q=clone_nexus[id]->pixels; for (x=0; x < (ssize_t) cache_info->columns; x++) { - register ssize_t + ssize_t i; if (x == (ssize_t) clone_info->columns) @@ -1117,7 +1117,7 @@ static inline void RelinquishCacheNexusPixels(NexusInfo *nexus_info) MagickPrivate NexusInfo **DestroyPixelCacheNexus(NexusInfo **nexus_info, const size_t number_threads) { - register ssize_t + ssize_t i; assert(nexus_info != (NexusInfo **) NULL); @@ -1852,7 +1852,7 @@ MagickExport CacheType GetImagePixelCacheType(const Image *image) static inline MagickBooleanType CopyPixel(const Image *image, const Quantum *source,Quantum *destination) { - register ssize_t + ssize_t i; if (source == (const Quantum *) NULL) @@ -1882,7 +1882,7 @@ MagickExport MagickBooleanType GetOneAuthenticPixel(Image *image, CacheInfo *magick_restrict cache_info; - register Quantum + Quantum *magick_restrict q; assert(image != (Image *) NULL); @@ -1937,7 +1937,7 @@ static MagickBooleanType GetOneAuthenticPixelFromCache(Image *image, const int id = GetOpenMPThreadId(); - register Quantum + Quantum *magick_restrict q; assert(image != (const Image *) NULL); @@ -2114,7 +2114,7 @@ MagickExport MagickBooleanType GetOneVirtualPixelInfo(const Image *image, const int id = GetOpenMPThreadId(); - register const Quantum + const Quantum *magick_restrict p; assert(image != (const Image *) NULL); @@ -2732,20 +2732,20 @@ MagickPrivate const Quantum *GetVirtualPixelCacheNexus(const Image *image, *magick_restrict pixels, virtual_pixel[MaxPixelChannels]; - register const Quantum + const Quantum *magick_restrict p; - register const void + const void *magick_restrict r; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t i, u; - register unsigned char + unsigned char *magick_restrict s; ssize_t @@ -3408,7 +3408,7 @@ static MagickBooleanType MaskPixelCacheNexus(Image *image,NexusInfo *nexus_info, CacheInfo *magick_restrict cache_info; - register Quantum + Quantum *magick_restrict p, *magick_restrict q; @@ -3435,7 +3435,7 @@ static MagickBooleanType MaskPixelCacheNexus(Image *image,NexusInfo *nexus_info, return(MagickFalse); for (y=0; y < (ssize_t) nexus_info->region.height; y++) { - register ssize_t + ssize_t x; for (x=0; x < (ssize_t) nexus_info->region.width; x++) @@ -3443,7 +3443,7 @@ static MagickBooleanType MaskPixelCacheNexus(Image *image,NexusInfo *nexus_info, double mask_alpha; - register ssize_t + ssize_t i; mask_alpha=(double) GetPixelCompositeMask(image,p); @@ -3547,7 +3547,7 @@ static inline MagickOffsetType WritePixelCacheRegion( const CacheInfo *magick_restrict cache_info,const MagickOffsetType offset, const MagickSizeType length,const unsigned char *magick_restrict buffer) { - register MagickOffsetType + MagickOffsetType i; ssize_t @@ -4370,7 +4370,7 @@ static inline MagickOffsetType ReadPixelCacheRegion( const CacheInfo *magick_restrict cache_info,const MagickOffsetType offset, const MagickSizeType length,unsigned char *magick_restrict buffer) { - register MagickOffsetType + MagickOffsetType i; ssize_t @@ -4412,10 +4412,10 @@ static MagickBooleanType ReadPixelCacheMetacontent( extent, length; - register ssize_t + ssize_t y; - register unsigned char + unsigned char *magick_restrict q; size_t @@ -4438,7 +4438,7 @@ static MagickBooleanType ReadPixelCacheMetacontent( case MemoryCache: case MapCache: { - register unsigned char + unsigned char *magick_restrict p; /* @@ -4583,10 +4583,10 @@ static MagickBooleanType ReadPixelCachePixels( extent, length; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t y; size_t @@ -4615,7 +4615,7 @@ static MagickBooleanType ReadPixelCachePixels( case MemoryCache: case MapCache: { - register Quantum + Quantum *magick_restrict p; /* @@ -5186,10 +5186,10 @@ static MagickBooleanType SetCacheAlphaChannel(Image *image,const Quantum alpha, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -5563,10 +5563,10 @@ static MagickBooleanType WritePixelCacheMetacontent(CacheInfo *cache_info, extent, length; - register const unsigned char + const unsigned char *magick_restrict p; - register ssize_t + ssize_t y; size_t @@ -5589,7 +5589,7 @@ static MagickBooleanType WritePixelCacheMetacontent(CacheInfo *cache_info, case MemoryCache: case MapCache: { - register unsigned char + unsigned char *magick_restrict q; /* @@ -5734,10 +5734,10 @@ static MagickBooleanType WritePixelCachePixels( extent, length; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t y; size_t @@ -5758,7 +5758,7 @@ static MagickBooleanType WritePixelCachePixels( case MemoryCache: case MapCache: { - register Quantum + Quantum *magick_restrict q; /* diff --git a/MagickCore/channel.c b/MagickCore/channel.c index 02968bbec..bc40e0ca7 100644 --- a/MagickCore/channel.c +++ b/MagickCore/channel.c @@ -147,13 +147,13 @@ static MagickBooleanType ChannelImage(Image *destination_image, destination_traits, source_traits; - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -574,13 +574,13 @@ MagickExport Image *CombineImages(const Image *image, Quantum *pixels; - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t i; if (status == MagickFalse) @@ -595,7 +595,7 @@ MagickExport Image *CombineImages(const Image *image, next=image; for (i=0; i < (ssize_t) GetPixelChannels(combine_image); i++) { - register ssize_t + ssize_t x; PixelChannel channel = GetPixelChannelChannel(combine_image,i); @@ -760,13 +760,13 @@ MagickExport Image *SeparateImage(const Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -781,7 +781,7 @@ MagickExport Image *SeparateImage(const Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; SetPixelChannel(separate_image,GrayPixelChannel,(Quantum) 0,q); @@ -852,7 +852,7 @@ MagickExport Image *SeparateImages(const Image *image,ExceptionInfo *exception) *images, *separate_image; - register ssize_t + ssize_t i; assert(image != (Image *) NULL); @@ -918,7 +918,7 @@ static inline void FlattenPixelInfo(const Image *image,const PixelInfo *p, gamma, Sa; - register ssize_t + ssize_t i; /* @@ -1010,10 +1010,10 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1030,7 +1030,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, double gamma; - register ssize_t + ssize_t i; gamma=QuantumScale*GetPixelAlpha(image,q); @@ -1070,10 +1070,10 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1130,10 +1130,10 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1151,7 +1151,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, gamma, Sa; - register ssize_t + ssize_t i; Sa=QuantumScale*GetPixelAlpha(image,q); @@ -1223,10 +1223,10 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1281,10 +1281,10 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, PixelInfo pixel; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) diff --git a/MagickCore/cipher.c b/MagickCore/cipher.c index b2b6ca30d..c25d19f8e 100644 --- a/MagickCore/cipher.c +++ b/MagickCore/cipher.c @@ -280,7 +280,7 @@ static AESInfo *DestroyAESInfo(AESInfo *aes_info) static inline void AddRoundKey(const unsigned int *ciphertext, const unsigned int *key,unsigned int *plaintext) { - register ssize_t + ssize_t i; /* @@ -320,10 +320,10 @@ static inline unsigned int ByteSubTransform(unsigned int x, static void FinalizeRoundKey(const unsigned int *ciphertext, const unsigned int *key,unsigned char *plaintext) { - register unsigned char + unsigned char *p; - register unsigned int + unsigned int i, j; @@ -349,10 +349,10 @@ static void FinalizeRoundKey(const unsigned int *ciphertext, static void InitializeRoundKey(const unsigned char *ciphertext, const unsigned int *key,unsigned int *plaintext) { - register const unsigned char + const unsigned char *p; - register unsigned int + unsigned int i, j; @@ -381,7 +381,7 @@ static inline unsigned int RotateLeft(const unsigned int x) static void EncipherAESBlock(AESInfo *aes_info,const unsigned char *plaintext, unsigned char *ciphertext) { - register ssize_t + ssize_t i, j; @@ -523,7 +523,7 @@ static void EncipherAESBlock(AESInfo *aes_info,const unsigned char *plaintext, static inline void IncrementCipherNonce(const size_t length, unsigned char *nonce) { - register ssize_t + ssize_t i; for (i=(ssize_t) (length-1); i >= 0; i--) @@ -583,7 +583,7 @@ MagickExport MagickBooleanType PasskeyDecipherImage(Image *image, SignatureInfo *signature_info; - register unsigned char + unsigned char *p; size_t @@ -658,11 +658,11 @@ MagickExport MagickBooleanType PasskeyDecipherImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t i, x; - register Quantum + Quantum *magick_restrict q; q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception); @@ -793,7 +793,7 @@ MagickExport MagickBooleanType PasskeyEncipherImage(Image *image, QuantumType quantum_type; - register unsigned char + unsigned char *p; SignatureInfo @@ -878,11 +878,11 @@ MagickExport MagickBooleanType PasskeyEncipherImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t i, x; - register Quantum + Quantum *magick_restrict q; q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception); @@ -960,7 +960,7 @@ MagickExport MagickBooleanType PasskeyEncipherImage(Image *image, static inline void InverseAddRoundKey(const unsigned int *alpha, unsigned int *beta) { - register unsigned int + unsigned int i, j; @@ -993,7 +993,7 @@ static inline unsigned int RotateRight(const unsigned int x) static void SetAESKey(AESInfo *aes_info,const StringInfo *key) { - register ssize_t + ssize_t i; ssize_t diff --git a/MagickCore/coder.c b/MagickCore/coder.c index 8b0abaf8d..4f2a82c9c 100644 --- a/MagickCore/coder.c +++ b/MagickCore/coder.c @@ -125,7 +125,7 @@ static MagickBooleanType static void *DestroyCoderNode(void *coder_info) { - register CoderInfo + CoderInfo *p; p=(CoderInfo *) coder_info; @@ -146,7 +146,7 @@ static SplayTreeInfo *AcquireCoderCache(ExceptionInfo *exception) MagickStatusType status; - register ssize_t + ssize_t i; SplayTreeInfo @@ -163,7 +163,7 @@ static SplayTreeInfo *AcquireCoderCache(ExceptionInfo *exception) CoderInfo *coder_info; - register const CoderMapInfo + const CoderMapInfo *p; p=CoderMap+i; @@ -325,10 +325,10 @@ MagickExport const CoderInfo **GetCoderInfoList(const char *pattern, const CoderInfo **coder_map; - register const CoderInfo + const CoderInfo *p; - register ssize_t + ssize_t i; /* @@ -395,7 +395,7 @@ MagickExport const CoderInfo **GetCoderInfoList(const char *pattern, static int CoderCompare(const void *x,const void *y) { - register const char + const char **p, **q; @@ -410,10 +410,10 @@ MagickExport char **GetCoderList(const char *pattern, char **coder_map; - register const CoderInfo + const CoderInfo *p; - register ssize_t + ssize_t i; /* @@ -520,7 +520,7 @@ MagickExport MagickBooleanType ListCoderInfo(FILE *file, const CoderInfo **coder_info; - register ssize_t + ssize_t i; size_t diff --git a/MagickCore/color-private.h b/MagickCore/color-private.h index 856a87e9a..29b90ce17 100644 --- a/MagickCore/color-private.h +++ b/MagickCore/color-private.h @@ -45,7 +45,7 @@ static inline MagickBooleanType GetColorRange(const char *color, if (*color != '\0') { - register char + char *p; (void) CopyMagickString(start_color,color,MagickPathExtent); diff --git a/MagickCore/color.c b/MagickCore/color.c index cb1a2f0f6..4da1f4de2 100644 --- a/MagickCore/color.c +++ b/MagickCore/color.c @@ -839,7 +839,7 @@ static LinkedListInfo *AcquireColorCache(const char *filename, MagickStatusType status; - register ssize_t + ssize_t i; /* @@ -874,7 +874,7 @@ static LinkedListInfo *AcquireColorCache(const char *filename, ColorInfo *color_info; - register const ColormapInfo + const ColormapInfo *p; p=Colormap+i; @@ -950,7 +950,7 @@ MagickPrivate MagickBooleanType ColorComponentGenesis(void) static void *DestroyColorElement(void *color_info) { - register ColorInfo + ColorInfo *p; p=(ColorInfo *) color_info; @@ -1010,10 +1010,10 @@ MagickExport const ColorInfo *GetColorCompliance(const char *name, char colorname[MagickPathExtent]; - register const ColorInfo + const ColorInfo *p; - register char + char *q; assert(exception != (ExceptionInfo *) NULL); @@ -1285,10 +1285,10 @@ MagickExport const ColorInfo **GetColorInfoList(const char *pattern, const ColorInfo **colors; - register const ColorInfo + const ColorInfo *p; - register ssize_t + ssize_t i; /* @@ -1359,7 +1359,7 @@ extern "C" { static int ColorCompare(const void *x,const void *y) { - register const char + const char **p, **q; @@ -1378,10 +1378,10 @@ MagickExport char **GetColorList(const char *pattern, char **colors; - register const ColorInfo + const ColorInfo *p; - register ssize_t + ssize_t i; /* @@ -1650,7 +1650,7 @@ MagickPrivate MagickBooleanType IsEquivalentAlpha(const Image *image, fuzz, pixel; - register double + double distance; if (image->alpha_trait == UndefinedPixelTrait) @@ -1718,11 +1718,11 @@ MagickExport MagickBooleanType IsEquivalentImage(const Image *image, target, pixel; - register const Quantum + const Quantum *p, *q; - register ssize_t + ssize_t i, x; @@ -1827,7 +1827,7 @@ MagickPrivate MagickBooleanType IsEquivalentIntensity(const Image *image, fuzz, pixel; - register double + double distance; if (GetPixelInfoIntensity(image,p) == GetPixelInfoIntensity(image,q)) @@ -1879,7 +1879,7 @@ MagickExport MagickBooleanType ListColorInfo(FILE *file, const ColorInfo **color_info; - register ssize_t + ssize_t i; size_t @@ -2184,7 +2184,7 @@ static MagickStatusType ParseCSSColor(const char *magick_restrict color, char *q; - register ssize_t + ssize_t i; MagickStatusType @@ -2274,10 +2274,10 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name, MagickStatusType flags; - register const ColorInfo + const ColorInfo *p; - register ssize_t + ssize_t i; ssize_t @@ -2418,7 +2418,7 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name, if ((LocaleCompare(colorspace,"color") == 0) || (LocaleCompare(colorspace,"icc-color") == 0)) { - register ssize_t + ssize_t j; (void) CopyMagickString(colorspace,name+i+2,MagickPathExtent); @@ -2661,7 +2661,7 @@ MagickExport MagickBooleanType QueryColorname( double alpha; - register const ColorInfo + const ColorInfo *p; magick_unreferenced(image); diff --git a/MagickCore/colormap.c b/MagickCore/colormap.c index 6c23412bf..8f9a14899 100644 --- a/MagickCore/colormap.c +++ b/MagickCore/colormap.c @@ -104,7 +104,7 @@ MagickExport MagickBooleanType AcquireImageColormap(Image *image, const size_t colors,ExceptionInfo *exception) { - register ssize_t + ssize_t i; /* @@ -209,10 +209,10 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; ssize_t @@ -302,7 +302,7 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image, MagickBooleanType status; - register ssize_t + ssize_t i; ssize_t @@ -347,10 +347,10 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image, Quantum index; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception); diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c index 87bd84b18..8a553d2c6 100644 --- a/MagickCore/colorspace.c +++ b/MagickCore/colorspace.c @@ -464,7 +464,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, PrimaryInfo primary_info; - register ssize_t + ssize_t i; ssize_t @@ -517,10 +517,10 @@ static MagickBooleanType sRGBTransformImage(Image *image, PixelInfo pixel; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -573,10 +573,10 @@ static MagickBooleanType sRGBTransformImage(Image *image, MagickBooleanType sync; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -630,10 +630,10 @@ static MagickBooleanType sRGBTransformImage(Image *image, MagickBooleanType sync; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -721,10 +721,10 @@ static MagickBooleanType sRGBTransformImage(Image *image, MagickBooleanType sync; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -959,10 +959,10 @@ static MagickBooleanType sRGBTransformImage(Image *image, MagickBooleanType sync; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -1026,10 +1026,10 @@ static MagickBooleanType sRGBTransformImage(Image *image, MagickBooleanType sync; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -1272,13 +1272,13 @@ static MagickBooleanType sRGBTransformImage(Image *image, PixelInfo pixel; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; - register unsigned int + unsigned int blue, green, red; @@ -1334,7 +1334,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, } case PseudoClass: { - register unsigned int + unsigned int blue, green, red; @@ -2031,7 +2031,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, MagickOffsetType progress; - register ssize_t + ssize_t i; ssize_t @@ -2079,10 +2079,10 @@ static MagickBooleanType TransformsRGBImage(Image *image, PixelInfo pixel; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -2135,10 +2135,10 @@ static MagickBooleanType TransformsRGBImage(Image *image, MagickBooleanType sync; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -2196,10 +2196,10 @@ static MagickBooleanType TransformsRGBImage(Image *image, MagickBooleanType sync; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -2288,10 +2288,10 @@ static MagickBooleanType TransformsRGBImage(Image *image, MagickBooleanType sync; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -2529,10 +2529,10 @@ static MagickBooleanType TransformsRGBImage(Image *image, MagickBooleanType sync; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -2595,10 +2595,10 @@ static MagickBooleanType TransformsRGBImage(Image *image, MagickBooleanType sync; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -2830,10 +2830,10 @@ static MagickBooleanType TransformsRGBImage(Image *image, PixelInfo pixel; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -2847,7 +2847,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - register size_t + size_t blue, green, red; @@ -2913,7 +2913,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, PixelInfo pixel; - register size_t + size_t blue, green, red; diff --git a/MagickCore/compare.c b/MagickCore/compare.c index 088e9199c..24867dde5 100644 --- a/MagickCore/compare.c +++ b/MagickCore/compare.c @@ -108,7 +108,7 @@ static size_t GetImageChannels(const Image *image) { - register ssize_t + ssize_t i; size_t @@ -234,14 +234,14 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image, MagickBooleanType sync; - register const Quantum + const Quantum *magick_restrict p, *magick_restrict q; - register Quantum + Quantum *magick_restrict r; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -264,7 +264,7 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image, MagickStatusType difference; - register ssize_t + ssize_t i; if ((GetPixelReadMask(image,p) <= (QuantumRange/2)) || @@ -399,11 +399,11 @@ static MagickBooleanType GetAbsoluteDistortion(const Image *image, double channel_distortion[MaxPixelChannels+1]; - register const Quantum + const Quantum *magick_restrict p, *magick_restrict q; - register ssize_t + ssize_t j, x; @@ -426,7 +426,7 @@ static MagickBooleanType GetAbsoluteDistortion(const Image *image, MagickBooleanType difference; - register ssize_t + ssize_t i; if ((GetPixelReadMask(image,p) <= (QuantumRange/2)) || @@ -493,7 +493,7 @@ static MagickBooleanType GetFuzzDistortion(const Image *image, MagickBooleanType status; - register ssize_t + ssize_t j; size_t @@ -518,11 +518,11 @@ static MagickBooleanType GetFuzzDistortion(const Image *image, double channel_distortion[MaxPixelChannels+1]; - register const Quantum + const Quantum *magick_restrict p, *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -541,7 +541,7 @@ static MagickBooleanType GetFuzzDistortion(const Image *image, Da, Sa; - register ssize_t + ssize_t i; if ((GetPixelReadMask(image,p) <= (QuantumRange/2)) || @@ -608,7 +608,7 @@ static MagickBooleanType GetMeanAbsoluteDistortion(const Image *image, MagickBooleanType status; - register ssize_t + ssize_t j; size_t @@ -633,11 +633,11 @@ static MagickBooleanType GetMeanAbsoluteDistortion(const Image *image, double channel_distortion[MaxPixelChannels+1]; - register const Quantum + const Quantum *magick_restrict p, *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -656,7 +656,7 @@ static MagickBooleanType GetMeanAbsoluteDistortion(const Image *image, Da, Sa; - register ssize_t + ssize_t i; if ((GetPixelReadMask(image,p) <= (QuantumRange/2)) || @@ -741,11 +741,11 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image, reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); for (y=0; y < (ssize_t) rows; y++) { - register const Quantum + const Quantum *magick_restrict p, *magick_restrict q; - register ssize_t + ssize_t x; p=GetCacheViewVirtualPixels(image_view,0,y,columns,1,exception); @@ -761,7 +761,7 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image, Da, Sa; - register ssize_t + ssize_t i; if ((GetPixelReadMask(image,p) <= (QuantumRange/2)) || @@ -824,7 +824,7 @@ static MagickBooleanType GetMeanSquaredDistortion(const Image *image, MagickBooleanType status; - register ssize_t + ssize_t j; size_t @@ -849,11 +849,11 @@ static MagickBooleanType GetMeanSquaredDistortion(const Image *image, double channel_distortion[MaxPixelChannels+1]; - register const Quantum + const Quantum *magick_restrict p, *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -872,7 +872,7 @@ static MagickBooleanType GetMeanSquaredDistortion(const Image *image, Da, Sa; - register ssize_t + ssize_t i; if ((GetPixelReadMask(image,p) <= (QuantumRange/2)) || @@ -948,7 +948,7 @@ static MagickBooleanType GetNormalizedCrossCorrelationDistortion( MagickOffsetType progress; - register ssize_t + ssize_t i; size_t @@ -985,11 +985,11 @@ static MagickBooleanType GetNormalizedCrossCorrelationDistortion( reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); for (y=0; y < (ssize_t) rows; y++) { - register const Quantum + const Quantum *magick_restrict p, *magick_restrict q; - register ssize_t + ssize_t x; p=GetCacheViewVirtualPixels(image_view,0,y,columns,1,exception); @@ -1016,11 +1016,11 @@ static MagickBooleanType GetNormalizedCrossCorrelationDistortion( area=PerceptibleReciprocal(area); for (y=0; y < (ssize_t) rows; y++) { - register const Quantum + const Quantum *magick_restrict p, *magick_restrict q; - register ssize_t + ssize_t x; p=GetCacheViewVirtualPixels(image_view,0,y,columns,1,exception); @@ -1151,11 +1151,11 @@ static MagickBooleanType GetPeakAbsoluteDistortion(const Image *image, double channel_distortion[MaxPixelChannels+1]; - register const Quantum + const Quantum *magick_restrict p, *magick_restrict q; - register ssize_t + ssize_t j, x; @@ -1175,7 +1175,7 @@ static MagickBooleanType GetPeakAbsoluteDistortion(const Image *image, Da, Sa; - register ssize_t + ssize_t i; if ((GetPixelReadMask(image,p) <= (QuantumRange/2)) || @@ -1241,7 +1241,7 @@ static MagickBooleanType GetPeakSignalToNoiseRatio(const Image *image, MagickBooleanType status; - register ssize_t + ssize_t i; status=GetMeanSquaredDistortion(image,reconstruct_image,distortion,exception); @@ -1293,7 +1293,7 @@ static MagickBooleanType GetPerceptualHashDistortion(const Image *image, double difference; - register ssize_t + ssize_t i; difference=0.0; @@ -1303,7 +1303,7 @@ static MagickBooleanType GetPerceptualHashDistortion(const Image *image, alpha, beta; - register ssize_t + ssize_t j; for (j=0; j < (ssize_t) channel_phash[0].number_colorspaces; j++) @@ -1338,7 +1338,7 @@ static MagickBooleanType GetRootMeanSquaredDistortion(const Image *image, MagickBooleanType status; - register ssize_t + ssize_t i; status=GetMeanSquaredDistortion(image,reconstruct_image,distortion,exception); @@ -1379,7 +1379,7 @@ static MagickBooleanType GetStructuralSimilarityDistortion(const Image *image, MagickBooleanType status; - register ssize_t + ssize_t i; size_t @@ -1429,11 +1429,11 @@ static MagickBooleanType GetStructuralSimilarityDistortion(const Image *image, double channel_distortion[MaxPixelChannels+1]; - register const Quantum + const Quantum *magick_restrict p, *magick_restrict q; - register ssize_t + ssize_t i, x; @@ -1460,11 +1460,11 @@ static MagickBooleanType GetStructuralSimilarityDistortion(const Image *image, y_pixel_mu[MaxPixelChannels+1], y_pixel_sigma_squared[MaxPixelChannels+1]; - register const Quantum + const Quantum *magick_restrict reference, *magick_restrict target; - register MagickRealType + MagickRealType *k; ssize_t @@ -1481,7 +1481,7 @@ static MagickBooleanType GetStructuralSimilarityDistortion(const Image *image, target=q; for (v=0; v < (ssize_t) kernel_info->height; v++) { - register ssize_t + ssize_t u; for (u=0; u < (ssize_t) kernel_info->width; u++) @@ -1578,7 +1578,7 @@ static MagickBooleanType GetStructuralDisimilarityDistortion(const Image *image, MagickBooleanType status; - register ssize_t + ssize_t i; status=GetStructuralSimilarityDistortion(image,reconstruct_image, @@ -1904,11 +1904,11 @@ MagickExport MagickBooleanType IsImagesEqual(const Image *image, reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); for (y=0; y < (ssize_t) rows; y++) { - register const Quantum + const Quantum *magick_restrict p, *magick_restrict q; - register ssize_t + ssize_t x; p=GetCacheViewVirtualPixels(image_view,0,y,columns,1,exception); @@ -1917,7 +1917,7 @@ MagickExport MagickBooleanType IsImagesEqual(const Image *image, break; for (x=0; x < (ssize_t) columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -2037,11 +2037,11 @@ MagickExport MagickBooleanType SetImageColorMetric(Image *image, reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); for (y=0; y < (ssize_t) rows; y++) { - register const Quantum + const Quantum *magick_restrict p, *magick_restrict q; - register ssize_t + ssize_t x; p=GetCacheViewVirtualPixels(image_view,0,y,columns,1,exception); @@ -2050,7 +2050,7 @@ MagickExport MagickBooleanType SetImageColorMetric(Image *image, break; for (x=0; x < (ssize_t) columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -2220,10 +2220,10 @@ MagickExport Image *SimilarityImage(const Image *image,const Image *reference, double similarity; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2242,7 +2242,7 @@ MagickExport Image *SimilarityImage(const Image *image,const Image *reference, } for (x=0; x < (ssize_t) (image->columns-reference->columns+1); x++) { - register ssize_t + ssize_t i; #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/MagickCore/composite-private.h b/MagickCore/composite-private.h index 0c3747c18..e982289a7 100644 --- a/MagickCore/composite-private.h +++ b/MagickCore/composite-private.h @@ -57,7 +57,7 @@ static inline void CompositePixelOver(const Image *image,const PixelInfo *p, gamma, Sa; - register ssize_t + ssize_t i; /* diff --git a/MagickCore/composite.c b/MagickCore/composite.c index 28e2dfbba..5e297ed5f 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -333,13 +333,13 @@ static MagickBooleanType CompositeOverImage(Image *image, canvas_pixel, source_pixel; - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -391,7 +391,7 @@ static MagickBooleanType CompositeOverImage(Image *image, Sc, Sca; - register ssize_t + ssize_t i; size_t @@ -624,13 +624,13 @@ MagickExport MagickBooleanType CompositeImage(Image *image, MagickBooleanType sync; - register const Quantum + const Quantum *p; - register Quantum + Quantum *q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -646,7 +646,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, } for (x=0; x < (ssize_t) source_image->columns; x++) { - register ssize_t + ssize_t i; if (GetPixelReadMask(source_image,p) <= (QuantumRange/2)) @@ -708,13 +708,13 @@ MagickExport MagickBooleanType CompositeImage(Image *image, MagickBooleanType sync; - register const Quantum + const Quantum *p; - register Quantum + Quantum *q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -880,13 +880,13 @@ MagickExport MagickBooleanType CompositeImage(Image *image, MagickBooleanType sync; - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (((y+y_offset) < 0) || ((y+y_offset) >= (ssize_t) image->rows)) @@ -1051,13 +1051,13 @@ MagickExport MagickBooleanType CompositeImage(Image *image, MagickBooleanType sync; - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (((y+y_offset) < 0) || ((y+y_offset) >= (ssize_t) image->rows)) @@ -1231,13 +1231,13 @@ MagickExport MagickBooleanType CompositeImage(Image *image, canvas_pixel, source_pixel; - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1294,7 +1294,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, Sc, Sca; - register ssize_t + ssize_t i; size_t @@ -2547,7 +2547,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, */ for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) texture_image->rows) { - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2597,14 +2597,14 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, MagickBooleanType sync; - register const Quantum + const Quantum *p, *pixels; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; size_t @@ -2623,7 +2623,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, } for (x=0; x < (ssize_t) image->columns; x+=(ssize_t) texture_image->columns) { - register ssize_t + ssize_t j; p=pixels; @@ -2632,7 +2632,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, width=image->columns-x; for (j=0; j < (ssize_t) width; j++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(texture_image); i++) diff --git a/MagickCore/compress.c b/MagickCore/compress.c index af56c0f35..5a0088b25 100644 --- a/MagickCore/compress.c +++ b/MagickCore/compress.c @@ -233,7 +233,7 @@ static inline void Ascii85Tuple(Ascii85Info *ascii85_info, { #define MaxLineExtent 36L - register ssize_t + ssize_t i, x; @@ -299,10 +299,10 @@ MagickExport void Ascii85Flush(Image *image) MagickExport void Ascii85Encode(Image *image,const unsigned char code) { - register char + char *q; - register unsigned char + unsigned char *p; ssize_t @@ -416,10 +416,10 @@ MagickExport MagickBooleanType HuffmanDecodeImage(Image *image, Quantum index; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *p; size_t @@ -497,10 +497,10 @@ MagickExport MagickBooleanType HuffmanDecodeImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); for (y=0; ((y < (ssize_t) image->rows) && (null_lines < 3)); ) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; /* @@ -716,14 +716,14 @@ RestoreMSCWarning \ MagickBooleanType proceed; - register ssize_t + ssize_t i, x; - register const Quantum + const Quantum *p; - register unsigned char + unsigned char *q; size_t @@ -940,7 +940,7 @@ MagickExport MagickBooleanType LZWEncodeImage(Image *image,const size_t length, next; } TableType; - register ssize_t + ssize_t i; size_t @@ -1087,7 +1087,7 @@ MagickExport MagickBooleanType PackbitsEncodeImage(Image *image, int count; - register ssize_t + ssize_t i, j; @@ -1239,7 +1239,7 @@ MagickExport MagickBooleanType ZLIBEncodeImage(Image *image,const size_t length, int status; - register ssize_t + ssize_t i; size_t diff --git a/MagickCore/configure.c b/MagickCore/configure.c index c4e512838..ef91003d7 100644 --- a/MagickCore/configure.c +++ b/MagickCore/configure.c @@ -253,7 +253,7 @@ MagickPrivate MagickBooleanType ConfigureComponentGenesis(void) static void *DestroyConfigureElement(void *configure_info) { - register ConfigureInfo + ConfigureInfo *p; p=(ConfigureInfo *) configure_info; @@ -349,7 +349,7 @@ MagickExport LinkedListInfo *DestroyConfigureOptions(LinkedListInfo *options) MagickExport const ConfigureInfo *GetConfigureInfo(const char *name, ExceptionInfo *exception) { - register const ConfigureInfo + const ConfigureInfo *p; assert(exception != (ExceptionInfo *) NULL); @@ -436,10 +436,10 @@ MagickExport const ConfigureInfo **GetConfigureInfoList(const char *pattern, const ConfigureInfo **options; - register const ConfigureInfo + const ConfigureInfo *p; - register ssize_t + ssize_t i; /* @@ -511,7 +511,7 @@ extern "C" { static int ConfigureCompare(const void *x,const void *y) { - register char + char **p, **q; @@ -530,10 +530,10 @@ MagickExport char **GetConfigureList(const char *pattern, char **options; - register const ConfigureInfo + const ConfigureInfo *p; - register ssize_t + ssize_t i; /* @@ -759,7 +759,7 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename, configure_path=GetEnvironmentValue("MAGICK_CONFIGURE_PATH"); if (configure_path != (char *) NULL) { - register char + char *p, *q; @@ -1053,7 +1053,7 @@ MagickExport MagickBooleanType ListConfigureInfo(FILE *file, const ConfigureInfo **configure_info; - register ssize_t + ssize_t i; size_t diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c index 255681bd5..92518ce96 100644 --- a/MagickCore/constitute.c +++ b/MagickCore/constitute.c @@ -140,7 +140,7 @@ MagickExport Image *ConstituteImage(const size_t columns,const size_t rows, MagickBooleanType status; - register ssize_t + ssize_t i; size_t @@ -1002,7 +1002,7 @@ MagickExport Image *ReadInlineImage(const ImageInfo *image_info, size_t length; - register const char + const char *p; /* @@ -1358,7 +1358,7 @@ MagickExport MagickBooleanType WriteImages(const ImageInfo *image_info, MagickStatusType status; - register Image + Image *p; assert(image_info != (const ImageInfo *) NULL); @@ -1385,7 +1385,7 @@ MagickExport MagickBooleanType WriteImages(const ImageInfo *image_info, p=images; for ( ; GetNextImageInList(p) != (Image *) NULL; p=GetNextImageInList(p)) { - register Image + Image *next; next=GetNextImageInList(p); @@ -1393,7 +1393,7 @@ MagickExport MagickBooleanType WriteImages(const ImageInfo *image_info, break; if (p->scene >= next->scene) { - register ssize_t + ssize_t i; /* diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c index 1aa7ec3e8..198bc742e 100644 --- a/MagickCore/decorate.c +++ b/MagickCore/decorate.c @@ -191,7 +191,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, shadow, trough; - register ssize_t + ssize_t x; size_t @@ -285,10 +285,10 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, frame_info->inner_bevel); if (height != 0) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; /* @@ -387,10 +387,10 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; size_t @@ -467,10 +467,10 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, frame_info->y-image->rows-bevel_width+frame_info->outer_bevel); if (height != 0) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; /* @@ -663,11 +663,11 @@ MagickExport MagickBooleanType RaiseImage(Image *image, #endif for (y=0; y < (ssize_t) raise_info->height; y++) { - register ssize_t + ssize_t i, x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -739,11 +739,11 @@ MagickExport MagickBooleanType RaiseImage(Image *image, #endif for (y=(ssize_t) raise_info->height; y < (ssize_t) (image->rows-raise_info->height); y++) { - register ssize_t + ssize_t i, x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -804,11 +804,11 @@ MagickExport MagickBooleanType RaiseImage(Image *image, #endif for (y=(ssize_t) (image->rows-raise_info->height); y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t i, x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c index 364bcb847..008031d58 100644 --- a/MagickCore/delegate.c +++ b/MagickCore/delegate.c @@ -273,7 +273,7 @@ MagickPrivate MagickBooleanType DelegateComponentGenesis(void) static void *DestroyDelegate(void *delegate_info) { - register DelegateInfo + DelegateInfo *p; p=(DelegateInfo *) delegate_info; @@ -356,7 +356,7 @@ MagickExport int ExternalDelegateCommand(const MagickBooleanType asynchronous, PolicyRights rights; - register ssize_t + ssize_t i; status=(-1); @@ -441,7 +441,7 @@ MagickExport int ExternalDelegateCommand(const MagickBooleanType asynchronous, #endif #elif defined(MAGICKCORE_WINDOWS_SUPPORT) { - register char + char *p; /* @@ -531,7 +531,7 @@ static char *SanitizeDelegateString(const char *source) const char *q; - register char + char *p; static char @@ -952,10 +952,10 @@ static char *InterpretDelegateProperties(ImageInfo *image_info, *interpret_text, *string; - register char + char *q; /* current position in interpret_text */ - register const char + const char *p; /* position in embed_text string being expanded */ size_t @@ -1110,7 +1110,7 @@ MagickExport char *GetDelegateCommand(const ImageInfo *image_info,Image *image, const DelegateInfo *delegate_info; - register ssize_t + ssize_t i; assert(image_info != (ImageInfo *) NULL); @@ -1212,7 +1212,7 @@ MagickExport const char *GetDelegateCommands(const DelegateInfo *delegate_info) MagickExport const DelegateInfo *GetDelegateInfo(const char *decode, const char *encode,ExceptionInfo *exception) { - register const DelegateInfo + const DelegateInfo *p; assert(exception != (ExceptionInfo *) NULL); @@ -1331,10 +1331,10 @@ MagickExport const DelegateInfo **GetDelegateInfoList(const char *pattern, const DelegateInfo **delegates; - register const DelegateInfo + const DelegateInfo *p; - register ssize_t + ssize_t i; /* @@ -1409,7 +1409,7 @@ extern "C" { static int DelegateCompare(const void *x,const void *y) { - register const char + const char **p, **q; @@ -1428,10 +1428,10 @@ MagickExport char **GetDelegateList(const char *pattern, char **delegates; - register const DelegateInfo + const DelegateInfo *p; - register ssize_t + ssize_t i; /* @@ -1611,7 +1611,7 @@ static MagickBooleanType CopyDelegateFile(const char *source, MagickBooleanType status; - register size_t + size_t i; size_t @@ -1693,7 +1693,7 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, PolicyRights rights; - register ssize_t + ssize_t i; /* @@ -1760,7 +1760,7 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, ImageInfo *clone_info; - register Image + Image *p; /* @@ -1952,7 +1952,7 @@ MagickExport MagickBooleanType ListDelegateInfo(FILE *file, const char *path; - register ssize_t + ssize_t i; size_t diff --git a/MagickCore/deprecate.c b/MagickCore/deprecate.c index b0badd22c..966fb6747 100644 --- a/MagickCore/deprecate.c +++ b/MagickCore/deprecate.c @@ -180,10 +180,10 @@ MagickExport void *CropImageToHBITMAP(Image *image, RectangleInfo page; - register const Quantum + const Quantum *p; - register RGBQUAD + RGBQUAD *q; RGBQUAD @@ -251,7 +251,7 @@ MagickExport void *CropImageToHBITMAP(Image *image, q=bitmap_bits; for (y=0; y < (ssize_t) page.height; y++) { - register ssize_t + ssize_t x; p=GetVirtualPixels(image,page.x,page.y+y,page.width,1,exception); @@ -320,13 +320,13 @@ MagickExport void *ImageToHBITMAP(Image *image,ExceptionInfo *exception) HBITMAP bitmapH; - register ssize_t + ssize_t x; - register const Quantum + const Quantum *p; - register RGBQUAD + RGBQUAD *q; RGBQUAD diff --git a/MagickCore/display.c b/MagickCore/display.c index 601dc5ed2..62d02bfdc 100644 --- a/MagickCore/display.c +++ b/MagickCore/display.c @@ -1629,7 +1629,7 @@ MagickExport MagickBooleanType DisplayImages(const ImageInfo *image_info, Image *image; - register ssize_t + ssize_t i; size_t @@ -1843,10 +1843,10 @@ static MagickBooleanType XAnnotateEditImage(Display *display, KeySym key_symbol; - register char + char *p; - register ssize_t + ssize_t i; unsigned int @@ -3301,10 +3301,10 @@ static MagickBooleanType XColorEditImage(Display *display, y, y_offset; - register Quantum + Quantum *q; - register ssize_t + ssize_t i; unsigned int @@ -4278,10 +4278,10 @@ static MagickBooleanType XCompositeImage(Display *display, Quantum opacity; - register int + int x; - register Quantum + Quantum *q; /* @@ -4596,7 +4596,7 @@ static MagickBooleanType XCropImage(Display *display, crop_info, highlight_info; - register Quantum + Quantum *q; unsigned int @@ -5434,7 +5434,7 @@ static MagickBooleanType XDrawEditImage(Display *display, RectangleInfo rectangle_info; - register int + int i; unsigned int @@ -7099,7 +7099,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, RectangleInfo page_geometry; - register int + int i; static char @@ -8938,7 +8938,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, unique_file=close(unique_file)-1; else { - register const char + const char *p; file=fdopen(unique_file,"w"); @@ -9311,7 +9311,7 @@ static void XMagnifyImage(Display *display,XWindows *windows,XEvent *event, char text[MagickPathExtent]; - register int + int x, y; @@ -9670,10 +9670,10 @@ static MagickBooleanType XMatteEditImage(Display *display, y, y_offset; - register int + int i; - register Quantum + Quantum *q; unsigned int @@ -10243,7 +10243,7 @@ static Image *XOpenImage(Display *display,XResourceInfo *resource_info, count, status; - register int + int i, j; @@ -10344,7 +10344,7 @@ static Image *XOpenImage(Display *display,XResourceInfo *resource_info, char title[MagickPathExtent]; - register int + int i; (void) FormatLocaleString(title,MagickPathExtent, @@ -12049,7 +12049,7 @@ static MagickBooleanType XRotateImage(Display *display, double normalized_degrees; - register int + int i; unsigned int @@ -12697,7 +12697,7 @@ extern "C" { static int XPredicate(Display *magick_unused(display),XEvent *event,char *data) { - register XWindows + XWindows *windows; windows=(XWindows *) data; @@ -12714,7 +12714,7 @@ static int XPredicate(Display *magick_unused(display),XEvent *event,char *data) static void XScreenEvent(Display *display,XWindows *windows,XEvent *event, ExceptionInfo *exception) { - register int + int x, y; @@ -13101,11 +13101,11 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info, double scale_factor; - register char + char *p, *q; - register int + int i; unsigned int @@ -13244,10 +13244,10 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info, PixelInfo pixel; - register int + int j; - register Quantum + Quantum *s; /* @@ -13467,7 +13467,7 @@ static MagickBooleanType XTrimImage(Display *display, RectangleInfo trim_info; - register int + int x, y; @@ -13630,7 +13630,7 @@ static Image *XVisualDirectoryImage(Display *display, RectangleInfo geometry; - register int + int i; static char @@ -14456,7 +14456,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, RectangleInfo geometry_info; - register int + int i; static char diff --git a/MagickCore/distort.c b/MagickCore/distort.c index be91ae16a..00ea1a013 100644 --- a/MagickCore/distort.c +++ b/MagickCore/distort.c @@ -377,7 +377,7 @@ static double *GenerateCoefficients(const Image *image, double *coeff; - register size_t + size_t i; size_t @@ -1121,7 +1121,7 @@ static double *GenerateCoefficients(const Image *image, size_t nterms; /* number of polynomial terms per number_values */ - register ssize_t + ssize_t j; MagickBooleanType @@ -2048,7 +2048,7 @@ MagickExport Image *DistortImage(const Image *image, DistortMethod method, /* Verbose output */ if (IsStringTrue(GetImageArtifact(image,"verbose")) != MagickFalse) { - register ssize_t + ssize_t i; char image_gen[MagickPathExtent]; const char *lookup; @@ -2491,10 +2491,10 @@ MagickExport Image *DistortImage(const Image *image, DistortMethod method, d, s; /* transform destination image x,y to source image x,y */ - register ssize_t + ssize_t i; - register Quantum + Quantum *magick_restrict q; q=QueueCacheViewAuthenticPixels(distort_view,0,j,distort_image->columns,1, @@ -2634,7 +2634,7 @@ MagickExport Image *DistortImage(const Image *image, DistortMethod method, case PolynomialDistortion: { /* multi-ordered polynomial */ - register ssize_t + ssize_t k; ssize_t @@ -3105,7 +3105,7 @@ MagickExport Image *SparseColorImage(const Image *image, switch (sparse_method) { case BarycentricColorInterpolate: { - register ssize_t x=0; + ssize_t x=0; (void) FormatLocaleFile(stderr, "Barycentric Sparse Color:\n"); if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) (void) FormatLocaleFile(stderr, " -channel R -fx '%+lf*i %+lf*j %+lf' \\\n", @@ -3128,7 +3128,7 @@ MagickExport Image *SparseColorImage(const Image *image, } case BilinearColorInterpolate: { - register ssize_t x=0; + ssize_t x=0; (void) FormatLocaleFile(stderr, "Bilinear Sparse Color\n"); if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) (void) FormatLocaleFile(stderr, " -channel R -fx '%+lf*i %+lf*j %+lf*i*j %+lf;\n", @@ -3202,10 +3202,10 @@ MagickExport Image *SparseColorImage(const Image *image, PixelInfo pixel; /* pixel to assign to distorted image */ - register ssize_t + ssize_t i; - register Quantum + Quantum *magick_restrict q; q=GetCacheViewAuthenticPixels(sparse_view,0,j,sparse_image->columns, @@ -3223,7 +3223,7 @@ MagickExport Image *SparseColorImage(const Image *image, { case BarycentricColorInterpolate: { - register ssize_t x=0; + ssize_t x=0; if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) pixel.red = coeff[x]*i +coeff[x+1]*j +coeff[x+2], x+=3; @@ -3245,7 +3245,7 @@ MagickExport Image *SparseColorImage(const Image *image, } case BilinearColorInterpolate: { - register ssize_t x=0; + ssize_t x=0; if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) pixel.red = coeff[x]*i + coeff[x+1]*j + coeff[x+2]*i*j + coeff[x+3], x+=4; @@ -3287,7 +3287,7 @@ MagickExport Image *SparseColorImage(const Image *image, pixel.alpha=0.0; denominator = 0.0; for(k=0; k<number_arguments; k+=2+number_colors) { - register ssize_t x=(ssize_t) k+2; + ssize_t x=(ssize_t) k+2; double weight = ((double)i-arguments[ k ])*((double)i-arguments[ k ]) + ((double)j-arguments[k+1])*((double)j-arguments[k+1]); @@ -3337,7 +3337,7 @@ MagickExport Image *SparseColorImage(const Image *image, fabs((double)i-arguments[ k ]) + fabs((double)j-arguments[k+1]); if ( distance < minimum ) { - register ssize_t x=(ssize_t) k+2; + ssize_t x=(ssize_t) k+2; if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) pixel.red=arguments[x++]; if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) @@ -3372,7 +3372,7 @@ MagickExport Image *SparseColorImage(const Image *image, ((double)i-arguments[ k ])*((double)i-arguments[ k ]) + ((double)j-arguments[k+1])*((double)j-arguments[k+1]); if ( distance < minimum ) { - register ssize_t x=(ssize_t) k+2; + ssize_t x=(ssize_t) k+2; if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) pixel.red=arguments[x++]; if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) diff --git a/MagickCore/distribute-cache.c b/MagickCore/distribute-cache.c index 601cb0ffc..d05588e3f 100644 --- a/MagickCore/distribute-cache.c +++ b/MagickCore/distribute-cache.c @@ -147,7 +147,7 @@ static inline MagickOffsetType dpc_read(int file,const MagickSizeType length, unsigned char *magick_restrict message) { - register MagickOffsetType + MagickOffsetType i; ssize_t @@ -278,7 +278,7 @@ static char *GetHostname(int *port,ExceptionInfo *exception) int argc; - register ssize_t + ssize_t i; static size_t @@ -427,7 +427,7 @@ static inline MagickOffsetType dpc_send(int file,const MagickSizeType length, MagickOffsetType count; - register MagickOffsetType + MagickOffsetType i; #if !MAGICKCORE_HAVE_DISTRIBUTE_CACHE @@ -484,7 +484,7 @@ static MagickBooleanType OpenDistributeCache(SplayTreeInfo *registry,int file, MagickSizeType length; - register unsigned char + unsigned char *p; unsigned char @@ -552,10 +552,10 @@ static MagickBooleanType ReadDistributeCacheMetacontent(SplayTreeInfo *registry, RectangleInfo region; - register const Quantum + const Quantum *p; - register unsigned char + unsigned char *q; unsigned char @@ -609,10 +609,10 @@ static MagickBooleanType ReadDistributeCachePixels(SplayTreeInfo *registry, RectangleInfo region; - register const Quantum + const Quantum *p; - register unsigned char + unsigned char *q; unsigned char @@ -671,10 +671,10 @@ static MagickBooleanType WriteDistributeCacheMetacontent( RectangleInfo region; - register Quantum + Quantum *q; - register unsigned char + unsigned char *p; unsigned char @@ -729,10 +729,10 @@ static MagickBooleanType WriteDistributeCachePixels(SplayTreeInfo *registry, RectangleInfo region; - register Quantum + Quantum *q; - register unsigned char + unsigned char *p; unsigned char @@ -784,7 +784,7 @@ static HANDLER_RETURN_TYPE DistributePixelCacheClient(void *socket) MagickOffsetType count; - register unsigned char + unsigned char *p; RandomInfo @@ -912,7 +912,7 @@ MagickExport void DistributePixelCacheServer(const int port, Not implemented! #endif - register struct addrinfo + struct addrinfo *p; SOCKET_TYPE @@ -1134,7 +1134,7 @@ MagickPrivate MagickBooleanType OpenDistributePixelCache( MagickOffsetType count; - register unsigned char + unsigned char *p; unsigned char @@ -1223,7 +1223,7 @@ MagickPrivate MagickOffsetType ReadDistributePixelCacheMetacontent( MagickOffsetType count; - register unsigned char + unsigned char *p; unsigned char @@ -1298,7 +1298,7 @@ MagickPrivate MagickOffsetType ReadDistributePixelCachePixels( MagickOffsetType count; - register unsigned char + unsigned char *p; unsigned char @@ -1370,7 +1370,7 @@ MagickPrivate MagickBooleanType RelinquishDistributePixelCache( MagickOffsetType count; - register unsigned char + unsigned char *p; unsigned char @@ -1434,7 +1434,7 @@ MagickPrivate MagickOffsetType WriteDistributePixelCacheMetacontent( MagickOffsetType count; - register unsigned char + unsigned char *p; unsigned char @@ -1510,7 +1510,7 @@ MagickPrivate MagickOffsetType WriteDistributePixelCachePixels( MagickOffsetType count; - register unsigned char + unsigned char *p; unsigned char diff --git a/MagickCore/draw.c b/MagickCore/draw.c index 346a27f40..4aa6a30b4 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -335,7 +335,7 @@ MagickExport DrawInfo *CloneDrawInfo(const ImageInfo *image_info, (void) CloneString(&clone_info->server_name,draw_info->server_name); if (draw_info->dash_pattern != (double *) NULL) { - register ssize_t + ssize_t x; for (x=0; fabs(draw_info->dash_pattern[x]) >= MagickEpsilon; x++) ; @@ -417,7 +417,7 @@ MagickExport DrawInfo *CloneDrawInfo(const ImageInfo *image_info, static PolygonInfo *DestroyPolygonInfo(PolygonInfo *polygon_info) { - register ssize_t + ssize_t i; if (polygon_info->edges != (EdgeInfo *) NULL) @@ -445,7 +445,7 @@ static int DrawCompareEdges(const void *p_edge,const void *q_edge) return(1); \ } - register const PointInfo + const PointInfo *p, *q; @@ -469,10 +469,10 @@ static int DrawCompareEdges(const void *p_edge,const void *q_edge) static void LogPolygonInfo(const PolygonInfo *polygon_info) { - register EdgeInfo + EdgeInfo *p; - register ssize_t + ssize_t i, j; @@ -502,7 +502,7 @@ static void ReversePoints(PointInfo *points,const size_t number_points) PointInfo point; - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) (number_points >> 1); i++) @@ -530,7 +530,7 @@ static PolygonInfo *ConvertPathToPolygon(const PathInfo *path_info, SegmentInfo bounds; - register ssize_t + ssize_t i, n; @@ -818,7 +818,7 @@ static PolygonInfo *ConvertPathToPolygon(const PathInfo *path_info, static void LogPathInfo(const PathInfo *path_info) { - register const PathInfo + const PathInfo *p; (void) LogMagickEvent(DrawEvent,GetMagickModule()," begin vector-path"); @@ -847,7 +847,7 @@ static PathInfo *ConvertPrimitiveToPath(const PrimitiveInfo *primitive_info, p, q; - register ssize_t + ssize_t i, n; @@ -1049,7 +1049,7 @@ static SegmentInfo AffineEdge(const Image *image,const AffineMatrix *affine, intercept, z; - register double + double x; SegmentInfo @@ -1170,7 +1170,7 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image, min, max; - register ssize_t + ssize_t i; SegmentInfo @@ -1250,10 +1250,10 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image, PointInfo point; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; SegmentInfo @@ -1354,7 +1354,7 @@ static MagickBooleanType DrawBoundingRectangles(Image *image, PrimitiveInfo primitive_info[6]; - register ssize_t + ssize_t i; SegmentInfo @@ -1760,11 +1760,11 @@ static MagickBooleanType DrawDashPolygon(const DrawInfo *draw_info, PrimitiveInfo *dash_polygon; - register double + double dx, dy; - register ssize_t + ssize_t i; size_t @@ -2059,10 +2059,10 @@ MagickExport MagickBooleanType DrawGradientImage(Image *image, composite, pixel; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t i, x; @@ -2280,7 +2280,7 @@ static MagickBooleanType CheckPrimitiveExtent(MVGInfo *mvg_info, *mvg_info->primitive_info,(size_t) extent,quantum); if (*mvg_info->primitive_info != (PrimitiveInfo *) NULL) { - register ssize_t + ssize_t i; *mvg_info->extent=(size_t) extent; @@ -2365,7 +2365,7 @@ static SplayTreeInfo *GetMVGMacros(const char *primitive) break; if (LocaleCompare("push",token) == 0) { - register const char + const char *end, *start; @@ -2493,10 +2493,10 @@ static MagickBooleanType RenderMVGContent(Image *image, PrimitiveType primitive_type; - register const char + const char *p; - register ssize_t + ssize_t i, x; @@ -4608,7 +4608,7 @@ MagickExport MagickBooleanType DrawPatternPath(Image *image, static PolygonInfo **DestroyPolygonThreadSet(PolygonInfo **polygon_info) { - register ssize_t + ssize_t i; assert(polygon_info != (PolygonInfo **) NULL); @@ -4628,7 +4628,7 @@ static PolygonInfo **AcquirePolygonThreadSet( PolygonInfo **polygon_info; - register ssize_t + ssize_t i; size_t @@ -4659,7 +4659,7 @@ static PolygonInfo **AcquirePolygonThreadSet( EdgeInfo *edge_info; - register ssize_t + ssize_t j; polygon_info[i]=(PolygonInfo *) AcquireMagickMemory( @@ -4729,13 +4729,13 @@ static double GetFillAlpha(PolygonInfo *polygon_info,const double mid, PointInfo delta; - register const PointInfo + const PointInfo *q; - register EdgeInfo + EdgeInfo *p; - register ssize_t + ssize_t i; ssize_t @@ -4907,10 +4907,10 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, PolygonInfo **magick_restrict polygon_info; - register EdgeInfo + EdgeInfo *p; - register ssize_t + ssize_t i; SegmentInfo @@ -4998,10 +4998,10 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, PixelInfo pixel; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; ssize_t @@ -5056,10 +5056,10 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, const int id = GetOpenMPThreadId(); - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; ssize_t @@ -5162,7 +5162,7 @@ static void LogPrimitiveInfo(const PrimitiveInfo *primitive_info) point, q; - register ssize_t + ssize_t i, x; @@ -5256,7 +5256,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, MagickStatusType status; - register ssize_t + ssize_t i, x; @@ -5301,7 +5301,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, PixelInfo pixel; - register Quantum + Quantum *q; q=GetCacheViewAuthenticPixels(image_view,x,y,1,1,exception); @@ -5323,7 +5323,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, GetPixelInfo(image,&pixel); for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1, @@ -5379,7 +5379,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1, @@ -5411,7 +5411,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, PixelInfo pixel; - register Quantum + Quantum *q; q=GetCacheViewAuthenticPixels(image_view,x,y,1,1,exception); @@ -5433,7 +5433,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, exception); for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1, @@ -5485,7 +5485,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, GetPixelInfo(image,&pixel); for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1, @@ -5608,7 +5608,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, PixelInfo fill_color; - register Quantum + Quantum *q; if ((y < 0) || (y >= (ssize_t) image->rows)) @@ -5765,7 +5765,7 @@ static MagickBooleanType DrawRoundLinecap(Image *image, PrimitiveInfo linecap[5]; - register ssize_t + ssize_t i; for (i=0; i < 4; i++) @@ -5795,7 +5795,7 @@ static MagickBooleanType DrawStrokePolygon(Image *image, PrimitiveInfo *stroke_polygon; - register const PrimitiveInfo + const PrimitiveInfo *p, *q; @@ -6044,7 +6044,7 @@ static inline double Permutate(const ssize_t n,const ssize_t k) double r; - register ssize_t + ssize_t i; r=1.0; @@ -6105,17 +6105,17 @@ static MagickBooleanType TraceArcPath(MVGInfo *mvg_info,const PointInfo start, points[3], radii; - register double + double cosine, sine; PrimitiveInfo *primitive_info; - register PrimitiveInfo + PrimitiveInfo *p; - register ssize_t + ssize_t i; size_t @@ -6250,10 +6250,10 @@ static MagickBooleanType TraceBezier(MVGInfo *mvg_info, PrimitiveInfo *primitive_info; - register PrimitiveInfo + PrimitiveInfo *p; - register ssize_t + ssize_t i, j; @@ -6409,10 +6409,10 @@ static MagickBooleanType TraceEllipse(MVGInfo *mvg_info,const PointInfo center, PrimitiveInfo *primitive_info; - register PrimitiveInfo + PrimitiveInfo *p; - register ssize_t + ssize_t i; /* @@ -6523,10 +6523,10 @@ static ssize_t TracePath(MVGInfo *mvg_info,const char *path, PrimitiveType primitive_type; - register PrimitiveInfo + PrimitiveInfo *q; - register ssize_t + ssize_t i; size_t @@ -7010,10 +7010,10 @@ static MagickBooleanType TraceRectangle(PrimitiveInfo *primitive_info, PointInfo point; - register PrimitiveInfo + PrimitiveInfo *p; - register ssize_t + ssize_t i; p=primitive_info; @@ -7057,10 +7057,10 @@ static MagickBooleanType TraceRoundRectangle(MVGInfo *mvg_info, PrimitiveInfo *primitive_info; - register PrimitiveInfo + PrimitiveInfo *p; - register ssize_t + ssize_t i; ssize_t @@ -7134,11 +7134,11 @@ static MagickBooleanType TraceSquareLinecap(PrimitiveInfo *primitive_info, double distance; - register double + double dx, dy; - register ssize_t + ssize_t i; ssize_t @@ -7253,7 +7253,7 @@ static PrimitiveInfo *TraceStrokePolygon(const DrawInfo *draw_info, *polygon_primitive, *stroke_polygon; - register ssize_t + ssize_t i; size_t diff --git a/MagickCore/effect.c b/MagickCore/effect.c index c95fd0145..30f46f631 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -152,7 +152,7 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, MagickOffsetType progress; - register ssize_t + ssize_t i; size_t @@ -257,13 +257,13 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, #endif for (y=0; y < (ssize_t) blur_image->rows; y++) { - register const Quantum + const Quantum *magick_restrict r; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -278,10 +278,10 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, } for (x=0; x < (ssize_t) blur_image->columns; x++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t i; ssize_t @@ -317,13 +317,13 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, blur_traits, traits; - register const double + const double *magick_restrict k; - register const Quantum + const Quantum *magick_restrict pixels; - register ssize_t + ssize_t u; ssize_t @@ -473,7 +473,7 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius, MagickOffsetType progress; - register ssize_t + ssize_t i; size_t @@ -578,13 +578,13 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius, #endif for (y=0; y < (ssize_t) sharp_image->rows; y++) { - register const Quantum + const Quantum *magick_restrict r; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -599,10 +599,10 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius, } for (x=0; x < (ssize_t) sharp_image->columns; x++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t i; ssize_t @@ -638,13 +638,13 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius, sharp_traits, traits; - register const double + const double *magick_restrict k; - register const Quantum + const Quantum *magick_restrict pixels; - register ssize_t + ssize_t u; ssize_t @@ -863,7 +863,7 @@ static inline double BlurGaussian(const double x,const double sigma) static double **DestroyBilateralThreadSet(const ssize_t number_threads, double **weights) { - register ssize_t + ssize_t i; assert(weights != (double **) NULL); @@ -880,7 +880,7 @@ static double **AcquireBilateralThreadSet(const size_t number_threads, double **weights; - register ssize_t + ssize_t i; weights=(double **) AcquireQuantumMemory(number_threads+1,sizeof(*weights)); @@ -924,7 +924,7 @@ MagickExport Image *BilateralBlurImage(const Image *image,const size_t width, OffsetInfo mid; - register ssize_t + ssize_t u; ssize_t @@ -983,10 +983,10 @@ MagickExport Image *BilateralBlurImage(const Image *image,const size_t width, const int id = GetOpenMPThreadId(); - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1004,11 +1004,11 @@ MagickExport Image *BilateralBlurImage(const Image *image,const size_t width, gamma, pixel; - register const Quantum + const Quantum *magick_restrict p, *magick_restrict r; - register ssize_t + ssize_t i, u; @@ -1218,7 +1218,7 @@ static void Hull(const Image *image,const ssize_t x_offset, const ssize_t y_offset,const size_t columns,const size_t rows, const int polarity,Quantum *magick_restrict f,Quantum *magick_restrict g) { - register Quantum + Quantum *p, *q, *r, @@ -1245,7 +1245,7 @@ static void Hull(const Image *image,const ssize_t x_offset, MagickRealType v; - register ssize_t + ssize_t i, x; @@ -1279,7 +1279,7 @@ static void Hull(const Image *image,const ssize_t x_offset, #endif for (y=0; y < (ssize_t) rows; y++) { - register ssize_t + ssize_t i, x; @@ -1332,7 +1332,7 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception) *magick_restrict buffer, *magick_restrict pixels; - register ssize_t + ssize_t i; size_t @@ -1398,7 +1398,7 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception) despeckle_traits, traits; - register ssize_t + ssize_t k, x; @@ -1420,7 +1420,7 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception) j=(ssize_t) image->columns+2; for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); @@ -1451,7 +1451,7 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception) MagickBooleanType sync; - register Quantum + Quantum *magick_restrict q; q=GetCacheViewAuthenticPixels(despeckle_view,0,y,despeckle_image->columns, @@ -1531,7 +1531,7 @@ MagickExport Image *EdgeImage(const Image *image,const double radius, KernelInfo *kernel_info; - register ssize_t + ssize_t i; size_t @@ -1615,7 +1615,7 @@ MagickExport Image *EmbossImage(const Image *image,const double radius, KernelInfo *kernel_info; - register ssize_t + ssize_t i; size_t @@ -1840,10 +1840,10 @@ MagickExport Image *KuwaharaImage(const Image *image,const double radius, #endif for (y=0; y < (ssize_t) gaussian_image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1867,7 +1867,7 @@ MagickExport Image *KuwaharaImage(const Image *image,const double radius, quadrant, target; - register size_t + size_t i; min_variance=MagickMaximumValue; @@ -1883,7 +1883,7 @@ MagickExport Image *KuwaharaImage(const Image *image,const double radius, mean[MaxPixelChannels], variance; - register ssize_t + ssize_t n; ssize_t @@ -2120,7 +2120,7 @@ MagickExport Image *LocalContrastImage(const Image *image,const double radius, *pix, *pixels; - register ssize_t + ssize_t y; ssize_t @@ -2198,10 +2198,10 @@ MagickExport Image *LocalContrastImage(const Image *image,const double radius, *pix, *pixels; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; ssize_t @@ -2323,7 +2323,7 @@ static MagickRealType *GetMotionBlurKernel(const size_t width, *kernel, normalize; - register ssize_t + ssize_t i; /* @@ -2374,7 +2374,7 @@ MagickExport Image *MotionBlurImage(const Image *image,const double radius, PointInfo point; - register ssize_t + ssize_t i; size_t @@ -2444,13 +2444,13 @@ MagickExport Image *MotionBlurImage(const Image *image,const double radius, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2465,7 +2465,7 @@ MagickExport Image *MotionBlurImage(const Image *image,const double radius, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -2482,13 +2482,13 @@ MagickExport Image *MotionBlurImage(const Image *image,const double radius, blur_traits, traits; - register const Quantum + const Quantum *magick_restrict r; - register MagickRealType + MagickRealType *magick_restrict k; - register ssize_t + ssize_t j; channel=GetPixelChannelChannel(image,i); @@ -2639,7 +2639,7 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, RectangleInfo geometry; - register ssize_t + ssize_t i, x; @@ -3162,7 +3162,7 @@ MagickExport Image *RotationalBlurImage(const Image *image,const double angle, PointInfo blur_center; - register ssize_t + ssize_t i; size_t @@ -3232,13 +3232,13 @@ MagickExport Image *RotationalBlurImage(const Image *image,const double angle, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -3259,7 +3259,7 @@ MagickExport Image *RotationalBlurImage(const Image *image,const double angle, PointInfo center; - register ssize_t + ssize_t i; size_t @@ -3292,10 +3292,10 @@ MagickExport Image *RotationalBlurImage(const Image *image,const double angle, blur_traits, traits; - register const Quantum + const Quantum *magick_restrict r; - register ssize_t + ssize_t j; channel=GetPixelChannelChannel(image,i); @@ -3440,7 +3440,7 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius, MagickRealType *kernel; - register ssize_t + ssize_t i; size_t @@ -3481,7 +3481,7 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius, format[MagickPathExtent], *message; - register const MagickRealType + const MagickRealType *k; ssize_t @@ -3554,14 +3554,14 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius, MagickBooleanType sync; - register const Quantum + const Quantum *magick_restrict l, *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -3583,7 +3583,7 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius, double intensity; - register ssize_t + ssize_t i; intensity=GetPixelIntensity(image,p+center); @@ -3601,14 +3601,14 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius, blur_traits, traits; - register const MagickRealType + const MagickRealType *magick_restrict k; - register const Quantum + const Quantum *magick_restrict luminance_pixels, *magick_restrict pixels; - register ssize_t + ssize_t u; ssize_t @@ -3833,16 +3833,16 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray, PrimaryInfo normal; - register const Quantum + const Quantum *magick_restrict center, *magick_restrict p, *magick_restrict post, *magick_restrict pre; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -3862,7 +3862,7 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray, normal.z=2.0*(double) QuantumRange; /* constant Z of surface normal */ for (x=0; x < (ssize_t) linear_image->columns; x++) { - register ssize_t + ssize_t i; /* @@ -4011,7 +4011,7 @@ MagickExport Image *SharpenImage(const Image *image,const double radius, KernelInfo *kernel_info; - register ssize_t + ssize_t i; size_t @@ -4171,10 +4171,10 @@ MagickExport Image *SpreadImage(const Image *image, const int id = GetOpenMPThreadId(); - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -4318,13 +4318,13 @@ MagickExport Image *UnsharpMaskImage(const Image *image,const double radius, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -4339,7 +4339,7 @@ MagickExport Image *UnsharpMaskImage(const Image *image,const double radius, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index c757471ff..2506d2e71 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -120,7 +120,7 @@ MagickExport MagickBooleanType AutoGammaImage(Image *image, MagickStatusType status; - register ssize_t + ssize_t i; log_mean=log(0.5); @@ -304,7 +304,7 @@ static void ClipCLAHEHistogram(const double clip_limit,const size_t number_bins, { #define NumberCLAHEGrays (65536) - register ssize_t + ssize_t i; size_t @@ -351,7 +351,7 @@ static void ClipCLAHEHistogram(const double clip_limit,const size_t number_bins, */ do { - register size_t + size_t *p; size_t @@ -380,10 +380,10 @@ static void GenerateCLAHEHistogram(const RectangleInfo *clahe_info, const RectangleInfo *tile_info,const size_t number_bins, const unsigned short *lut,const unsigned short *pixels,size_t *histogram) { - register const unsigned short + const unsigned short *p; - register ssize_t + ssize_t i; /* @@ -420,7 +420,7 @@ static void InterpolateCLAHE(const RectangleInfo *clahe_info,const size_t *Q12, */ for (y=(ssize_t) tile->height; y > 0; y--) { - register ssize_t + ssize_t x; for (x=(ssize_t) tile->width; x > 0; x--) @@ -459,7 +459,7 @@ static void MapCLAHEHistogram(const RangeInfo *range_info, scale, sum; - register ssize_t + ssize_t i; /* @@ -483,7 +483,7 @@ static MagickBooleanType CLAHE(const RectangleInfo *clahe_info, MemoryInfo *tile_cache; - register unsigned short + unsigned short *p; size_t @@ -522,7 +522,7 @@ static MagickBooleanType CLAHE(const RectangleInfo *clahe_info, p=pixels; for (y=0; y < (ssize_t) clahe_info->y; y++) { - register ssize_t + ssize_t x; for (x=0; x < (ssize_t) clahe_info->x; x++) @@ -551,7 +551,7 @@ static MagickBooleanType CLAHE(const RectangleInfo *clahe_info, RectangleInfo tile; - register ssize_t + ssize_t x; tile.height=tile_info->height; @@ -698,10 +698,10 @@ MagickExport MagickBooleanType CLAHEImage(Image *image,const size_t width, n=0; for (y=0; y < (ssize_t) clahe_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -743,10 +743,10 @@ MagickExport MagickBooleanType CLAHEImage(Image *image,const size_t width, n=clahe_info.width*(tile_info.y >> 1); for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -848,7 +848,7 @@ MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image, PixelInfo *clut_map; - register ssize_t + ssize_t i; ssize_t adjust, @@ -896,10 +896,10 @@ MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image, PixelInfo pixel; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1055,7 +1055,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, PixelInfo *cdl_map; - register ssize_t + ssize_t i; ssize_t @@ -1291,10 +1291,10 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, double luma; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1413,7 +1413,7 @@ MagickExport MagickBooleanType ContrastImage(Image *image, MagickOffsetType progress; - register ssize_t + ssize_t i; ssize_t @@ -1466,10 +1466,10 @@ MagickExport MagickBooleanType ContrastImage(Image *image, green, red; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1569,7 +1569,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, MagickOffsetType progress; - register ssize_t + ssize_t i; ssize_t @@ -1613,10 +1613,10 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, image_view=AcquireVirtualCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1652,7 +1652,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, double intensity; - register ssize_t + ssize_t j; black[i]=0.0; @@ -1682,7 +1682,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, sizeof(*stretch_map)); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - register ssize_t + ssize_t j; for (j=0; j <= (ssize_t) MaxMap; j++) @@ -1704,7 +1704,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, } if (image->storage_class == PseudoClass) { - register ssize_t + ssize_t j; /* @@ -1750,10 +1750,10 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1766,7 +1766,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t j; for (j=0; j < (ssize_t) GetPixelChannels(image); j++) @@ -1911,13 +1911,13 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception) PixelInfo pixel; - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; ssize_t @@ -1946,7 +1946,7 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception) PixelInfo aggregate; - register const Quantum + const Quantum *magick_restrict r; GetPixelInfo(image,&aggregate); @@ -2047,7 +2047,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, MagickOffsetType progress; - register ssize_t + ssize_t i; ssize_t @@ -2090,10 +2090,10 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, image_view=AcquireVirtualCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2129,7 +2129,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, double intensity; - register ssize_t + ssize_t j; intensity=0.0; @@ -2145,7 +2145,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, (void) memset(white,0,sizeof(*white)); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - register ssize_t + ssize_t j; black[i]=map[i]; @@ -2160,7 +2160,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, map=(double *) RelinquishMagickMemory(map); if (image->storage_class == PseudoClass) { - register ssize_t + ssize_t j; /* @@ -2217,10 +2217,10 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2233,7 +2233,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t j; for (j=0; j < (ssize_t) GetPixelChannels(image); j++) @@ -2325,7 +2325,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, Quantum *gamma_map; - register ssize_t + ssize_t i; ssize_t @@ -2380,10 +2380,10 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2396,7 +2396,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t j; for (j=0; j < (ssize_t) GetPixelChannels(image); j++) @@ -2511,10 +2511,10 @@ MagickExport MagickBooleanType GrayscaleImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2739,10 +2739,10 @@ MagickExport MagickBooleanType HaldClutImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2916,7 +2916,7 @@ MagickExport MagickBooleanType LevelImage(Image *image,const double black_point, MagickOffsetType progress; - register ssize_t + ssize_t i; ssize_t @@ -2960,10 +2960,10 @@ MagickExport MagickBooleanType LevelImage(Image *image,const double black_point, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2976,7 +2976,7 @@ MagickExport MagickBooleanType LevelImage(Image *image,const double black_point, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t j; for (j=0; j < (ssize_t) GetPixelChannels(image); j++) @@ -3070,7 +3070,7 @@ MagickExport MagickBooleanType LevelizeImage(Image *image, MagickOffsetType progress; - register ssize_t + ssize_t i; ssize_t @@ -3112,10 +3112,10 @@ MagickExport MagickBooleanType LevelizeImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -3128,7 +3128,7 @@ MagickExport MagickBooleanType LevelizeImage(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t j; for (j=0; j < (ssize_t) GetPixelChannels(image); j++) @@ -3374,10 +3374,10 @@ MagickExport MagickBooleanType LinearStretchImage(Image *image, image_view=AcquireVirtualCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); @@ -3649,7 +3649,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate, MagickStatusType flags; - register ssize_t + ssize_t i; ssize_t @@ -3773,10 +3773,10 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -3917,7 +3917,7 @@ MagickExport MagickBooleanType NegateImage(Image *image, MagickOffsetType progress; - register ssize_t + ssize_t i; ssize_t @@ -3957,10 +3957,10 @@ MagickExport MagickBooleanType NegateImage(Image *image, MagickBooleanType sync; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -3974,7 +3974,7 @@ MagickExport MagickBooleanType NegateImage(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t j; if (IsPixelGray(image,q) == MagickFalse) @@ -4018,10 +4018,10 @@ MagickExport MagickBooleanType NegateImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -4034,7 +4034,7 @@ MagickExport MagickBooleanType NegateImage(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t j; for (j=0; j < (ssize_t) GetPixelChannels(image); j++) @@ -4270,7 +4270,7 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, */ if (image->storage_class == PseudoClass) { - register ssize_t + ssize_t i; if( sharpen != MagickFalse ) @@ -4318,10 +4318,10 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -4334,7 +4334,7 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -4436,10 +4436,10 @@ MagickExport MagickBooleanType WhiteBalanceImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -4466,10 +4466,10 @@ MagickExport MagickBooleanType WhiteBalanceImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) diff --git a/MagickCore/exception.c b/MagickCore/exception.c index 305edcb1c..17ab46d11 100644 --- a/MagickCore/exception.c +++ b/MagickCore/exception.c @@ -149,7 +149,7 @@ MagickExport ExceptionInfo *AcquireExceptionInfo(void) static void *DestroyExceptionElement(void *exception) { - register ExceptionInfo + ExceptionInfo *p; p=(ExceptionInfo *) exception; @@ -205,7 +205,7 @@ MagickExport void CatchException(ExceptionInfo *exception) LinkedListInfo *exceptions; - register const ExceptionInfo + const ExceptionInfo *p; ssize_t @@ -687,7 +687,7 @@ MagickExport const char *GetLocaleExceptionMessage(const ExceptionType severity, MagickExport void InheritException(ExceptionInfo *exception, const ExceptionInfo *relative) { - register const ExceptionInfo + const ExceptionInfo *p; assert(exception != (ExceptionInfo *) NULL); @@ -995,7 +995,7 @@ MagickExport MagickBooleanType ThrowException(ExceptionInfo *exception, LinkedListInfo *exceptions; - register ExceptionInfo + ExceptionInfo *p; assert(exception != (ExceptionInfo *) NULL); diff --git a/MagickCore/feature.c b/MagickCore/feature.c index 7162bcad0..b024c7d20 100644 --- a/MagickCore/feature.c +++ b/MagickCore/feature.c @@ -165,10 +165,10 @@ static MagickBooleanType TraceEdges(Image *edge_image,CacheView *edge_view, MagickBooleanType status; - register Quantum + Quantum *q; - register ssize_t + ssize_t i; q=GetCacheViewAuthenticPixels(edge_view,x,y,1,1,exception); @@ -315,10 +315,10 @@ MagickExport Image *CannyEdgeImage(const Image *image,const double radius, #endif for (y=0; y < (ssize_t) edge_image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -339,7 +339,7 @@ MagickExport Image *CannyEdgeImage(const Image *image,const double radius, dx, dy; - register const Quantum + const Quantum *magick_restrict kernel_pixels; ssize_t @@ -427,10 +427,10 @@ MagickExport Image *CannyEdgeImage(const Image *image,const double radius, #endif for (y=0; y < (ssize_t) edge_image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -522,7 +522,7 @@ MagickExport Image *CannyEdgeImage(const Image *image,const double radius, edge_view=AcquireAuthenticCacheView(edge_image,exception); for (y=0; y < (ssize_t) edge_image->rows; y++) { - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -532,7 +532,7 @@ MagickExport Image *CannyEdgeImage(const Image *image,const double radius, CannyInfo pixel; - register const Quantum + const Quantum *magick_restrict p; /* @@ -659,7 +659,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, MagickBooleanType status; - register ssize_t + ssize_t i, r; @@ -710,10 +710,10 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, #endif for (r=0; r < (ssize_t) image->rows; r++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -881,10 +881,10 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, image_view=AcquireVirtualCacheView(image,exception); for (r=0; r < (ssize_t) image->rows; r++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; ssize_t @@ -1014,7 +1014,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, double normalize; - register ssize_t + ssize_t y; switch (i) @@ -1056,7 +1056,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, normalize=PerceptibleReciprocal(normalize); for (y=0; y < (ssize_t) number_grays; y++) { - register ssize_t + ssize_t x; for (x=0; x < (ssize_t) number_grays; x++) @@ -1080,12 +1080,12 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, #endif for (i=0; i < 4; i++) { - register ssize_t + ssize_t y; for (y=0; y < (ssize_t) number_grays; y++) { - register ssize_t + ssize_t x; for (x=0; x < (ssize_t) number_grays; x++) @@ -1265,7 +1265,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, #endif for (i=0; i < 4; i++) { - register ssize_t + ssize_t x; for (x=2; x < (ssize_t) (2*number_grays); x++) @@ -1341,12 +1341,12 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, #endif for (i=0; i < 4; i++) { - register ssize_t + ssize_t y; for (y=0; y < (ssize_t) number_grays; y++) { - register ssize_t + ssize_t x; for (x=0; x < (ssize_t) number_grays; x++) @@ -1456,7 +1456,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, #endif for (i=0; i < 4; i++) { - register ssize_t + ssize_t x; for (x=0; x < (ssize_t) number_grays; x++) @@ -1613,7 +1613,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, for (z=0; z < (ssize_t) number_grays; z++) { - register ssize_t + ssize_t y; ChannelStatistics @@ -1622,7 +1622,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, (void) memset(&pixel,0,sizeof(pixel)); for (y=0; y < (ssize_t) number_grays; y++) { - register ssize_t + ssize_t x; for (x=0; x < (ssize_t) number_grays; x++) @@ -1874,7 +1874,7 @@ MagickExport Image *HoughLineImage(const Image *image,const size_t width, PointInfo center; - register ssize_t + ssize_t y; size_t @@ -1914,10 +1914,10 @@ MagickExport Image *HoughLineImage(const Image *image,const size_t width, image_view=AcquireVirtualCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1932,7 +1932,7 @@ MagickExport Image *HoughLineImage(const Image *image,const size_t width, { if (GetPixelIntensity(image,p) > (QuantumRange/2.0)) { - register ssize_t + ssize_t i; for (i=0; i < 180; i++) @@ -1999,7 +1999,7 @@ MagickExport Image *HoughLineImage(const Image *image,const size_t width, line_count=threshold; for (y=0; y < (ssize_t) accumulator_height; y++) { - register ssize_t + ssize_t x; for (x=0; x < (ssize_t) accumulator_width; x++) @@ -2210,13 +2210,13 @@ MagickExport Image *MeanShiftImage(const Image *image,const size_t width, #endif for (y=0; y < (ssize_t) mean_image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2239,7 +2239,7 @@ MagickExport Image *MeanShiftImage(const Image *image,const size_t width, mean_location, previous_location; - register ssize_t + ssize_t i; GetPixelInfo(image,&mean_pixel); diff --git a/MagickCore/fourier.c b/MagickCore/fourier.c index c0359237f..28b5d6615 100644 --- a/MagickCore/fourier.c +++ b/MagickCore/fourier.c @@ -247,17 +247,17 @@ MagickExport Image *ComplexImages(const Image *images,const ComplexOperator op, #endif for (y=0; y < (ssize_t) rows; y++) { - register const Quantum + const Quantum *magick_restrict Ai, *magick_restrict Ar, *magick_restrict Bi, *magick_restrict Br; - register Quantum + Quantum *magick_restrict Ci, *magick_restrict Cr; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -277,7 +277,7 @@ MagickExport Image *ComplexImages(const Image *images,const ComplexOperator op, } for (x=0; x < (ssize_t) columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) number_channels; i++) @@ -412,7 +412,7 @@ static MagickBooleanType RollFourier(const size_t width,const size_t height, MemoryInfo *source_info; - register ssize_t + ssize_t i, x; @@ -458,7 +458,7 @@ static MagickBooleanType ForwardQuadrantSwap(const size_t width, MagickBooleanType status; - register ssize_t + ssize_t x; ssize_t @@ -488,7 +488,7 @@ static MagickBooleanType ForwardQuadrantSwap(const size_t width, static void CorrectPhaseLHS(const size_t width,const size_t height, double *fourier_pixels) { - register ssize_t + ssize_t x; ssize_t @@ -521,10 +521,10 @@ static MagickBooleanType ForwardFourier(const FourierInfo *fourier_info, *magnitude_info, *phase_info; - register Quantum + Quantum *q; - register ssize_t + ssize_t x; ssize_t @@ -712,10 +712,10 @@ static MagickBooleanType ForwardFourierTransform(FourierInfo *fourier_info, *forward_info, *source_info; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; @@ -1083,7 +1083,7 @@ MagickExport Image *ForwardFourierTransformImage(const Image *image, static MagickBooleanType InverseQuadrantSwap(const size_t width, const size_t height,const double *source,double *destination) { - register ssize_t + ssize_t x; ssize_t @@ -1125,10 +1125,10 @@ static MagickBooleanType InverseFourier(FourierInfo *fourier_info, *magnitude_info, *phase_info; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; @@ -1324,10 +1324,10 @@ static MagickBooleanType InverseFourierTransform(FourierInfo *fourier_info, MemoryInfo *source_info; - register Quantum + Quantum *q; - register ssize_t + ssize_t i, x; diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 5208ae9c7..b71cb7d6d 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -186,7 +186,7 @@ MagickPrivate FxInfo *AcquireFxInfo(const Image *images,const char *expression, FxInfo *fx_info; - register ssize_t + ssize_t i; unsigned char @@ -295,7 +295,7 @@ MagickPrivate FxInfo *AcquireFxInfo(const Image *images,const char *expression, */ MagickPrivate FxInfo *DestroyFxInfo(FxInfo *fx_info) { - register ssize_t + ssize_t i; fx_info->exception=DestroyExceptionInfo(fx_info->exception); @@ -392,7 +392,7 @@ static double FxChannelStatistics(FxInfo *fx_info,Image *image, double statistic; - register const char + const char *p; channel_mask=UndefinedChannel; @@ -507,7 +507,7 @@ static inline MagickBooleanType IsFxFunction(const char *expression, int c; - register size_t + size_t i; for (i=0; i <= length; i++) @@ -535,7 +535,7 @@ static inline const char *FxSubexpression(const char *expression, const char *subexpression; - register ssize_t + ssize_t level; level=0; @@ -587,7 +587,7 @@ static double FxGetSymbol(FxInfo *fx_info,const PixelChannel channel, PointInfo point; - register ssize_t + ssize_t i; size_t @@ -1200,10 +1200,10 @@ static const char *FxOperatorPrecedence(const char *expression, precedence, target; - register const char + const char *subexpression; - register int + int c; size_t @@ -1487,7 +1487,7 @@ static double FxEvaluateSubexpression(FxInfo *fx_info, sans, value; - register const char + const char *p; *beta=0.0; @@ -2739,7 +2739,7 @@ MagickPrivate MagickBooleanType FxEvaluateChannelExpression(FxInfo *fx_info, static FxInfo **DestroyFxThreadSet(FxInfo **fx_info) { - register ssize_t + ssize_t i; assert(fx_info != (FxInfo **) NULL); @@ -2762,7 +2762,7 @@ static FxInfo **AcquireFxThreadSet(const Image *image,const char *expression, FxInfo **fx_info; - register ssize_t + ssize_t i; size_t @@ -2860,13 +2860,13 @@ MagickExport Image *FxImage(const Image *image,const char *expression, const int id = GetOpenMPThreadId(); - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2880,7 +2880,7 @@ MagickExport Image *FxImage(const Image *image,const char *expression, } for (x=0; x < (ssize_t) fx_image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) diff --git a/MagickCore/gem.c b/MagickCore/gem.c index f37990c6c..a992dbb52 100644 --- a/MagickCore/gem.c +++ b/MagickCore/gem.c @@ -675,7 +675,7 @@ MagickPrivate void ConvertHWBToRGB(const double hue,const double whiteness, r, v; - register ssize_t + ssize_t i; /* @@ -1578,7 +1578,7 @@ MagickPrivate double GenerateDifferentialNoise(RandomInfo *random_info, double poisson; - register ssize_t + ssize_t i; poisson=exp(-SigmaPoisson*QuantumScale*pixel); @@ -1640,7 +1640,7 @@ MagickPrivate size_t GetOptimalKernelWidth1D(const double radius, normalize, value; - register ssize_t + ssize_t i; size_t diff --git a/MagickCore/geometry.c b/MagickCore/geometry.c index 33881ad4d..dd26a2658 100644 --- a/MagickCore/geometry.c +++ b/MagickCore/geometry.c @@ -464,7 +464,7 @@ MagickExport char *GetPageGeometry(const char *page_geometry) char page[MaxTextExtent]; - register ssize_t + ssize_t i; assert(page_geometry != (char *) NULL); @@ -758,7 +758,7 @@ MagickExport MagickStatusType ParseAffineGeometry(const char *geometry, MagickStatusType flags; - register ssize_t + ssize_t i; GetAffineMatrix(affine_matrix); diff --git a/MagickCore/histogram.c b/MagickCore/histogram.c index b4e30051c..9a08cdecf 100644 --- a/MagickCore/histogram.c +++ b/MagickCore/histogram.c @@ -195,15 +195,15 @@ static CubeInfo *ClassifyImageColors(const Image *image, NodeInfo *node_info; - register const Quantum + const Quantum *p; - register size_t + size_t id, index, level; - register ssize_t + ssize_t i, x; @@ -338,7 +338,7 @@ static CubeInfo *ClassifyImageColors(const Image *image, static void DefineImageHistogram(const Image *image,NodeInfo *node_info, PixelInfo **histogram) { - register ssize_t + ssize_t i; size_t @@ -353,7 +353,7 @@ static void DefineImageHistogram(const Image *image,NodeInfo *node_info, DefineImageHistogram(image,node_info->child[i],histogram); if (node_info->level == (MaxTreeDepth-1)) { - register PixelInfo + PixelInfo *p; p=node_info->list; @@ -392,7 +392,7 @@ static void DefineImageHistogram(const Image *image,NodeInfo *node_info, */ static CubeInfo *DestroyCubeInfo(const Image *image,CubeInfo *cube_info) { - register Nodes + Nodes *nodes; /* @@ -437,7 +437,7 @@ static CubeInfo *DestroyCubeInfo(const Image *image,CubeInfo *cube_info) */ static void DestroyColorCube(const Image *image,NodeInfo *node_info) { - register ssize_t + ssize_t i; size_t @@ -650,16 +650,16 @@ static MagickBooleanType CheckImageColors(const Image *image, pixel, target; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; - register NodeInfo + NodeInfo *node_info; - register ssize_t + ssize_t i; size_t @@ -904,7 +904,7 @@ MagickExport MagickBooleanType MinMaxStretchImage(Image *image, min, max; - register ssize_t + ssize_t i; MagickStatusType @@ -1019,10 +1019,10 @@ MagickExport size_t GetNumberColors(const Image *image,FILE *file, PixelInfo pixel; - register PixelInfo + PixelInfo *p; - register ssize_t + ssize_t i; size_t @@ -1126,7 +1126,7 @@ static void UniqueColorsToImage(Image *unique_image,CacheView *unique_view, MagickBooleanType status; - register ssize_t + ssize_t i; size_t @@ -1142,10 +1142,10 @@ static void UniqueColorsToImage(Image *unique_image,CacheView *unique_view, node_info->child[i],exception); if (node_info->level == (MaxTreeDepth-1)) { - register PixelInfo + PixelInfo *p; - register Quantum + Quantum *magick_restrict q; status=MagickTrue; diff --git a/MagickCore/identify.c b/MagickCore/identify.c index 09eb141a2..4478fbf40 100644 --- a/MagickCore/identify.c +++ b/MagickCore/identify.c @@ -134,7 +134,7 @@ static ChannelStatistics *GetLocationStatistics(const Image *image, ChannelStatistics *channel_statistics; - register ssize_t + ssize_t i; ssize_t @@ -169,10 +169,10 @@ static ChannelStatistics *GetLocationStatistics(const Image *image, } for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -309,7 +309,7 @@ static ssize_t PrintChannelLocations(FILE *file,const Image *image, n=0; for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *p; ssize_t @@ -352,7 +352,7 @@ static ssize_t PrintChannelMoments(FILE *file,const PixelChannel channel, powers[MaximumNumberOfImageMoments] = { 1.0, 2.0, 3.0, 3.0, 6.0, 4.0, 6.0, 4.0 }; - register ssize_t + ssize_t i; ssize_t @@ -383,7 +383,7 @@ static ssize_t PrintChannelMoments(FILE *file,const PixelChannel channel, static ssize_t PrintChannelPerceptualHash(Image *image,FILE *file, const ChannelPerceptualHash *channel_phash) { - register ssize_t + ssize_t i; ssize_t @@ -407,7 +407,7 @@ static ssize_t PrintChannelPerceptualHash(Image *image,FILE *file, PixelTrait traits; - register ssize_t + ssize_t j; channel=GetPixelChannelChannel(image,i); @@ -419,7 +419,7 @@ static ssize_t PrintChannelPerceptualHash(Image *image,FILE *file, n=FormatLocaleFile(file," Channel %.20g:\n",(double) channel); for (j=0; j < MaximumNumberOfPerceptualHashes; j++) { - register ssize_t + ssize_t k; n+=FormatLocaleFile(file," PH%.20g: ",(double) j+1); @@ -513,10 +513,10 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, MagickBooleanType ping; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; @@ -1083,7 +1083,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, PixelInfo pixel; - register PixelInfo + PixelInfo *magick_restrict c; GetPixelInfo(image,&pixel); @@ -1218,7 +1218,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, ImageInfo *image_info; - register char + char *d, *q; @@ -1286,7 +1286,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, *bounding_box, *convex_hull; - register ssize_t + ssize_t n; size_t @@ -1358,7 +1358,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, record, sentinel; - register ssize_t + ssize_t j; size_t diff --git a/MagickCore/image-view.c b/MagickCore/image-view.c index 2ac0022c8..5fb865a50 100644 --- a/MagickCore/image-view.c +++ b/MagickCore/image-view.c @@ -253,11 +253,11 @@ MagickExport MagickBooleanType DuplexTransferImageViewIterator( MagickBooleanType sync; - register const Quantum + const Quantum *magick_restrict duplex_pixels, *magick_restrict pixels; - register Quantum + Quantum *magick_restrict destination_pixels; if (status == MagickFalse) @@ -563,7 +563,7 @@ MagickExport MagickBooleanType GetImageViewIterator(ImageView *source, const int id = GetOpenMPThreadId(); - register const Quantum + const Quantum *pixels; if (status == MagickFalse) @@ -911,7 +911,7 @@ MagickExport MagickBooleanType SetImageViewIterator(ImageView *destination, MagickBooleanType sync; - register Quantum + Quantum *magick_restrict pixels; if (status == MagickFalse) @@ -1040,10 +1040,10 @@ MagickExport MagickBooleanType TransferImageViewIterator(ImageView *source, MagickBooleanType sync; - register const Quantum + const Quantum *magick_restrict pixels; - register Quantum + Quantum *magick_restrict destination_pixels; if (status == MagickFalse) @@ -1169,7 +1169,7 @@ MagickExport MagickBooleanType UpdateImageViewIterator(ImageView *source, const int id = GetOpenMPThreadId(); - register Quantum + Quantum *magick_restrict pixels; if (status == MagickFalse) diff --git a/MagickCore/image.c b/MagickCore/image.c index 3f6925fb4..4e9240aab 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -446,7 +446,7 @@ MagickExport Image *AppendImages(const Image *images, RectangleInfo geometry; - register const Image + const Image *next; size_t @@ -545,13 +545,13 @@ MagickExport Image *AppendImages(const Image *images, PixelInfo pixel; - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1081,13 +1081,13 @@ MagickExport MagickBooleanType CopyImagePixels(Image *image, MagickBooleanType sync; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -1103,7 +1103,7 @@ MagickExport MagickBooleanType CopyImagePixels(Image *image, } for (x=0; x < (ssize_t) geometry->width; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -1476,13 +1476,13 @@ MagickExport Image *GetImageMask(const Image *image,const PixelMask type, mask_view=AcquireAuthenticCacheView(mask_image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1646,7 +1646,7 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, MagickBooleanType canonical; - register const char + const char *p; ssize_t @@ -1695,10 +1695,10 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, const char *option; - register char + char *r; - register ssize_t + ssize_t i; ssize_t @@ -1817,10 +1817,10 @@ MagickExport MagickBooleanType IsHighDynamicRangeImage(const Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1833,7 +1833,7 @@ MagickExport MagickBooleanType IsHighDynamicRangeImage(const Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -1889,7 +1889,7 @@ MagickExport MagickBooleanType IsHighDynamicRangeImage(const Image *image, */ MagickExport MagickBooleanType IsImageObject(const Image *image) { - register const Image + const Image *p; assert(image != (Image *) NULL); @@ -1930,7 +1930,7 @@ MagickExport MagickBooleanType IsTaintImage(const Image *image) magick[MagickPathExtent], filename[MagickPathExtent]; - register const Image + const Image *p; assert(image != (Image *) NULL); @@ -2067,10 +2067,10 @@ MagickExport Image *NewMagickImage(const ImageInfo *image_info, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2267,10 +2267,10 @@ MagickExport MagickBooleanType ResetImagePixels(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2346,10 +2346,10 @@ MagickExport MagickBooleanType SetImageAlpha(Image *image,const Quantum alpha, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2432,10 +2432,10 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image, image_view=AcquireAuthenticCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2546,10 +2546,10 @@ MagickExport MagickBooleanType SetImageColor(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2724,7 +2724,7 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info, MagickBooleanType status; - register const char + const char *p; ssize_t @@ -2812,7 +2812,7 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info, MagickFormatType format_type; - register ssize_t + ssize_t i; static const char @@ -3248,13 +3248,13 @@ MagickExport MagickBooleanType SetImageMask(Image *image,const PixelMask type, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -3404,10 +3404,10 @@ MagickExport MagickBooleanType SetImageRegionMask(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -3544,10 +3544,10 @@ static ssize_t SmushXGap(const Image *smush_image,const Image *images, left_geometry, right_geometry; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, y; @@ -3615,10 +3615,10 @@ static ssize_t SmushYGap(const Image *smush_image,const Image *images, bottom_geometry, top_geometry; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; @@ -3695,7 +3695,7 @@ MagickExport Image *SmushImages(const Image *images, RectangleInfo geometry; - register const Image + const Image *next; size_t @@ -3910,10 +3910,10 @@ MagickExport MagickBooleanType SyncImage(Image *image,ExceptionInfo *exception) Quantum index; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) diff --git a/MagickCore/layer.c b/MagickCore/layer.c index 63bda6d1a..87161c960 100644 --- a/MagickCore/layer.c +++ b/MagickCore/layer.c @@ -109,10 +109,10 @@ static void ClearBounds(Image *image,RectangleInfo *bounds, (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception); for (y=0; y < (ssize_t) bounds->height; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; q=GetAuthenticPixels(image,bounds->x,bounds->y+y,bounds->width,1,exception); @@ -165,11 +165,11 @@ static void ClearBounds(Image *image,RectangleInfo *bounds, static MagickBooleanType IsBoundsCleared(const Image *image1, const Image *image2,RectangleInfo *bounds,ExceptionInfo *exception) { - register const Quantum + const Quantum *p, *q; - register ssize_t + ssize_t x; ssize_t @@ -233,7 +233,7 @@ MagickExport Image *CoalesceImages(const Image *image,ExceptionInfo *exception) *dispose_image, *previous; - register Image + Image *next; RectangleInfo @@ -402,7 +402,7 @@ MagickExport Image *DisposeImages(const Image *images,ExceptionInfo *exception) RectangleInfo bounds; - register Image + Image *image, *next; @@ -619,11 +619,11 @@ static RectangleInfo CompareImagesBounds(const Image *image1, pixel1, pixel2; - register const Quantum + const Quantum *p, *q; - register ssize_t + ssize_t x; ssize_t @@ -773,10 +773,10 @@ MagickExport Image *CompareImagesLayers(const Image *image, RectangleInfo *bounds; - register const Image + const Image *next; - register ssize_t + ssize_t i; assert(image != (const Image *) NULL); @@ -961,10 +961,10 @@ static Image *OptimizeLayerFrames(const Image *image,const LayerMethod method, DisposeType *disposals; - register const Image + const Image *curr; - register ssize_t + ssize_t i; assert(image != (const Image *) NULL); @@ -1491,7 +1491,7 @@ MagickExport void OptimizeImageTransparency(const Image *image, Image *dispose_image; - register Image + Image *next; /* @@ -1619,7 +1619,7 @@ MagickExport void RemoveDuplicateLayers(Image **images,ExceptionInfo *exception) RectangleInfo bounds; - register Image + Image *image, *next; @@ -1949,7 +1949,7 @@ MagickExport Image *MergeImageLayers(Image *image,const LayerMethod method, RectangleInfo page; - register const Image + const Image *next; size_t diff --git a/MagickCore/linked-list.c b/MagickCore/linked-list.c index b23d60d50..787475a92 100644 --- a/MagickCore/linked-list.c +++ b/MagickCore/linked-list.c @@ -111,7 +111,7 @@ struct _LinkedListInfo MagickExport MagickBooleanType AppendValueToLinkedList( LinkedListInfo *list_info,const void *value) { - register ElementInfo + ElementInfo *next; assert(list_info != (LinkedListInfo *) NULL); @@ -168,7 +168,7 @@ MagickExport void ClearLinkedList(LinkedListInfo *list_info, ElementInfo *element; - register ElementInfo + ElementInfo *next; assert(list_info != (LinkedListInfo *) NULL); @@ -222,7 +222,7 @@ MagickExport LinkedListInfo *DestroyLinkedList(LinkedListInfo *list_info, ElementInfo *entry; - register ElementInfo + ElementInfo *next; assert(list_info != (LinkedListInfo *) NULL); @@ -382,10 +382,10 @@ MagickExport size_t GetNumberOfElementsInLinkedList( MagickExport void *GetValueFromLinkedList(LinkedListInfo *list_info, const size_t index) { - register ElementInfo + ElementInfo *next; - register ssize_t + ssize_t i; void @@ -447,10 +447,10 @@ MagickExport void *GetValueFromLinkedList(LinkedListInfo *list_info, MagickExport MagickBooleanType InsertValueInLinkedList( LinkedListInfo *list_info,const size_t index,const void *value) { - register ElementInfo + ElementInfo *next; - register ssize_t + ssize_t i; assert(list_info != (LinkedListInfo *) NULL); @@ -552,10 +552,10 @@ MagickExport MagickBooleanType InsertValueInSortedLinkedList( ElementInfo *element; - register ElementInfo + ElementInfo *next; - register ssize_t + ssize_t i; assert(list_info != (LinkedListInfo *) NULL); @@ -666,10 +666,10 @@ MagickExport MagickBooleanType IsLinkedListEmpty( MagickExport MagickBooleanType LinkedListToArray(LinkedListInfo *list_info, void **array) { - register ElementInfo + ElementInfo *next; - register ssize_t + ssize_t i; assert(list_info != (LinkedListInfo *) NULL); @@ -831,7 +831,7 @@ MagickExport void *RemoveElementFromLinkedList(LinkedListInfo *list_info, ElementInfo *next; - register ssize_t + ssize_t i; void diff --git a/MagickCore/list.c b/MagickCore/list.c index 8ca4c14e9..cfd9d4e82 100644 --- a/MagickCore/list.c +++ b/MagickCore/list.c @@ -79,7 +79,7 @@ */ MagickExport void AppendImageToList(Image **images,const Image *append) { - register Image + Image *p, *q; @@ -131,7 +131,7 @@ MagickExport Image *CloneImageList(const Image *images,ExceptionInfo *exception) *clone, *image; - register Image + Image *p; if (images == (Image *) NULL) @@ -219,7 +219,7 @@ MagickExport Image *CloneImages(const Image *images,const char *scenes, *clone_images, *image; - register ssize_t + ssize_t i; size_t @@ -383,7 +383,7 @@ MagickExport void DeleteImages(Image **images,const char *scenes, MagickBooleanType *delete_list; - register ssize_t + ssize_t i; size_t @@ -527,7 +527,7 @@ MagickExport Image *DuplicateImages(Image *images, *clone_images, *duplicate_images; - register ssize_t + ssize_t i; /* @@ -573,7 +573,7 @@ MagickExport Image *DuplicateImages(Image *images, */ MagickExport Image *GetFirstImageInList(const Image *images) { - register const Image + const Image *p; if (images == (Image *) NULL) @@ -617,10 +617,10 @@ MagickExport Image *GetFirstImageInList(const Image *images) */ MagickExport Image *GetImageFromList(const Image *images,const ssize_t index) { - register const Image + const Image *p; - register ssize_t + ssize_t i; if (images == (Image *) NULL) @@ -669,7 +669,7 @@ MagickExport Image *GetImageFromList(const Image *images,const ssize_t index) */ MagickExport ssize_t GetImageIndexInList(const Image *images) { - register ssize_t + ssize_t i; if (images == (const Image *) NULL) @@ -708,7 +708,7 @@ MagickExport ssize_t GetImageIndexInList(const Image *images) */ MagickExport size_t GetImageListLength(const Image *images) { - register ssize_t + ssize_t i; if (images == (Image *) NULL) @@ -749,7 +749,7 @@ MagickExport size_t GetImageListLength(const Image *images) */ MagickExport Image *GetLastImageInList(const Image *images) { - register const Image + const Image *p; if (images == (Image *) NULL) @@ -860,7 +860,7 @@ MagickExport Image **ImageListToArray(const Image *images, Image **group; - register ssize_t + ssize_t i; if (images == (Image *) NULL) @@ -1015,7 +1015,7 @@ MagickExport void PrependImageToList(Image **images,Image *prepend) */ MagickExport Image *RemoveImageFromList(Image **images) { - register Image + Image *p; assert(images != (Image **) NULL); @@ -1296,7 +1296,7 @@ MagickExport void ReverseImageList(Image **images) Image *next; - register Image + Image *p; assert(images != (Image **) NULL); @@ -1351,7 +1351,7 @@ MagickExport Image *SpliceImageIntoList(Image **images, *image, *split; - register size_t + size_t i; assert(images != (Image **) NULL); @@ -1429,7 +1429,7 @@ MagickExport Image *SplitImageList(Image *images) */ MagickExport void SyncImageList(Image *images) { - register Image + Image *p, *q; diff --git a/MagickCore/locale.c b/MagickCore/locale.c index 31d74b4fd..d67c1f1ba 100644 --- a/MagickCore/locale.c +++ b/MagickCore/locale.c @@ -169,7 +169,7 @@ static locale_t AcquireCLocale(void) static void *DestroyLocaleNode(void *locale_info) { - register LocaleInfo + LocaleInfo *p; p=(LocaleInfo *) locale_info; @@ -584,10 +584,10 @@ MagickExport const LocaleInfo **GetLocaleInfoList(const char *pattern, const LocaleInfo **messages; - register const LocaleInfo + const LocaleInfo *p; - register ssize_t + ssize_t i; /* @@ -660,7 +660,7 @@ extern "C" { static int LocaleTagCompare(const void *x,const void *y) { - register char + char **p, **q; @@ -679,10 +679,10 @@ MagickExport char **GetLocaleList(const char *pattern,size_t *number_messages, char **messages; - register const LocaleInfo + const LocaleInfo *p; - register ssize_t + ssize_t i; /* @@ -914,7 +914,7 @@ static MagickBooleanType IsLocaleTreeInstantiated(ExceptionInfo *exception) char *locale; - register const char + const char *p; locale=(char *) NULL; @@ -1032,7 +1032,7 @@ MagickExport MagickBooleanType ListLocaleInfo(FILE *file, const LocaleInfo **locale_info; - register ssize_t + ssize_t i; size_t @@ -1104,7 +1104,7 @@ MagickExport MagickBooleanType ListLocaleInfo(FILE *file, static void ChopLocaleComponents(char *path,const size_t components) { - register char + char *p; ssize_t @@ -1162,7 +1162,7 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *cache,const char *xml, MagickStatusType status; - register char + char *p; size_t @@ -1411,7 +1411,7 @@ MagickExport int LocaleCompare(const char *p,const char *q) if (q == (char *) NULL) return(1); { - register const unsigned char + const unsigned char *r = (const unsigned char *) p, *s = (const unsigned char *) q; @@ -1446,7 +1446,7 @@ MagickExport int LocaleCompare(const char *p,const char *q) */ MagickExport void LocaleLower(char *string) { - register char + char *q; assert(string != (char *) NULL); @@ -1537,11 +1537,11 @@ MagickExport int LocaleNCompare(const char *p,const char *q,const size_t length) if (length == 0) return(0); { - register const unsigned char + const unsigned char *s = (const unsigned char *) p, *t = (const unsigned char *) q; - register size_t + size_t n = length; for (n--; (*s != '\0') && (*t != '\0') && (n != 0) && ((*s == *t) || @@ -1575,7 +1575,7 @@ MagickExport int LocaleNCompare(const char *p,const char *q,const size_t length) */ MagickExport void LocaleUpper(char *string) { - register char + char *q; assert(string != (char *) NULL); diff --git a/MagickCore/log.c b/MagickCore/log.c index 1b2c02c91..1dcdf565d 100644 --- a/MagickCore/log.c +++ b/MagickCore/log.c @@ -273,7 +273,7 @@ static LinkedListInfo *AcquireLogCache(const char *filename, MagickStatusType status; - register ssize_t + ssize_t i; /* @@ -308,7 +308,7 @@ static LinkedListInfo *AcquireLogCache(const char *filename, LogInfo *log_info; - register const LogMapInfo + const LogMapInfo *p; p=LogMap+i; @@ -403,7 +403,7 @@ MagickExport void CloseMagickLog(void) */ static LogInfo *GetLogInfo(const char *name,ExceptionInfo *exception) { - register LogInfo + LogInfo *p; assert(exception != (ExceptionInfo *) NULL); @@ -487,10 +487,10 @@ MagickExport const LogInfo **GetLogInfoList(const char *pattern, const LogInfo **preferences; - register const LogInfo + const LogInfo *p; - register ssize_t + ssize_t i; /* @@ -561,7 +561,7 @@ extern "C" { static int LogCompare(const void *x,const void *y) { - register const char + const char **p, **q; @@ -580,10 +580,10 @@ MagickExport char **GetLogList(const char *pattern,size_t *number_preferences, char **preferences; - register const LogInfo + const LogInfo *p; - register ssize_t + ssize_t i; /* @@ -761,7 +761,7 @@ MagickExport MagickBooleanType ListLogInfo(FILE *file,ExceptionInfo *exception) const LogInfo **log_info; - register ssize_t + ssize_t i; size_t @@ -1123,7 +1123,7 @@ MagickPrivate MagickBooleanType LogComponentGenesis(void) static void *DestroyLogElement(void *log_info) { - register LogInfo + LogInfo *p; p=(LogInfo *) log_info; @@ -1206,10 +1206,10 @@ static char *TranslateEvent(const char *module,const char *function, LogInfo *log_info; - register char + char *q; - register const char + const char *p; size_t @@ -1360,7 +1360,7 @@ static char *TranslateEvent(const char *module,const char *function, } case 'm': { - register const char + const char *r; for (r=module+strlen(module)-1; r > module; r--) @@ -1426,10 +1426,10 @@ static char *TranslateFilename(const LogInfo *log_info) char *filename; - register char + char *q; - register const char + const char *p; size_t @@ -1704,10 +1704,10 @@ static LogHandlerType ParseLogHandlers(const char *handlers) LogHandlerType handler_mask; - register const char + const char *p; - register ssize_t + ssize_t i; size_t diff --git a/MagickCore/magic.c b/MagickCore/magic.c index d3058feec..4d5147066 100644 --- a/MagickCore/magic.c +++ b/MagickCore/magic.c @@ -192,7 +192,7 @@ static LinkedListInfo *AcquireMagicList(ExceptionInfo *exception) MagickStatusType status; - register ssize_t + ssize_t i; list=NewLinkedList(0); @@ -205,7 +205,7 @@ static LinkedListInfo *AcquireMagicList(ExceptionInfo *exception) MagicInfo *magic_info; - register const MagicMapInfo + const MagicMapInfo *p; p=MagicMap+i; @@ -280,7 +280,7 @@ static MagickBooleanType IsMagicCacheInstantiated() MagickExport const MagicInfo *GetMagicInfo(const unsigned char *magic, const size_t length,ExceptionInfo *exception) { - register const MagicInfo + const MagicInfo *p; assert(exception != (ExceptionInfo *) NULL); @@ -362,7 +362,7 @@ MagickExport const MagicInfo *GetMagicInfo(const unsigned char *magic, */ MagickExport size_t GetMagicPatternExtent(ExceptionInfo *exception) { - register const MagicInfo + const MagicInfo *p; size_t @@ -447,10 +447,10 @@ MagickExport const MagicInfo **GetMagicInfoList(const char *pattern, const MagicInfo **aliases; - register const MagicInfo + const MagicInfo *p; - register ssize_t + ssize_t i; /* @@ -523,7 +523,7 @@ extern "C" { static int MagicCompare(const void *x,const void *y) { - register const char + const char *p, *q; @@ -542,10 +542,10 @@ MagickExport char **GetMagicList(const char *pattern,size_t *number_aliases, char **aliases; - register const MagicInfo + const MagicInfo *p; - register ssize_t + ssize_t i; /* @@ -679,7 +679,7 @@ MagickExport MagickBooleanType ListMagicInfo(FILE *file, const MagicInfo **magic_info; - register ssize_t + ssize_t i; size_t @@ -775,7 +775,7 @@ MagickPrivate MagickBooleanType MagicComponentGenesis(void) static void *DestroyMagicElement(void *magic_info) { - register MagicInfo + MagicInfo *p; p=(MagicInfo *) magic_info; diff --git a/MagickCore/magick.c b/MagickCore/magick.c index 0e60ffce7..2244d1d98 100644 --- a/MagickCore/magick.c +++ b/MagickCore/magick.c @@ -296,7 +296,7 @@ MagickExport MagickBooleanType GetImageMagick(const unsigned char *magick, MagickBooleanType status; - register const MagickInfo + const MagickInfo *p; (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); @@ -610,7 +610,7 @@ MagickExport MagickBooleanType GetMagickEndianSupport( MagickExport const MagickInfo *GetMagickInfo(const char *name, ExceptionInfo *exception) { - register const MagickInfo + const MagickInfo *magick_info; /* @@ -703,10 +703,10 @@ MagickExport const MagickInfo **GetMagickInfoList(const char *pattern, const MagickInfo **formats; - register const MagickInfo + const MagickInfo *p; - register ssize_t + ssize_t i; /* @@ -777,7 +777,7 @@ extern "C" { static int MagickCompare(const void *x,const void *y) { - register const char + const char **p, **q; @@ -796,10 +796,10 @@ MagickExport char **GetMagickList(const char *pattern, char **formats; - register const MagickInfo + const MagickInfo *p; - register ssize_t + ssize_t i; /* @@ -1067,7 +1067,7 @@ MagickExport MagickBooleanType GetMagickUseExtension( static void *DestroyMagickNode(void *magick_info) { - register MagickInfo + MagickInfo *p; p=(MagickInfo *) magick_info; @@ -1177,7 +1177,7 @@ MagickExport MagickBooleanType ListMagickInfo(FILE *file, const MagickInfo **magick_info; - register ssize_t + ssize_t i; size_t @@ -1803,7 +1803,7 @@ MagickExport int SetMagickPrecision(const int precision) */ MagickExport MagickBooleanType UnregisterMagickInfo(const char *name) { - register const MagickInfo + const MagickInfo *p; MagickBooleanType diff --git a/MagickCore/matrix.c b/MagickCore/matrix.c index 977081e75..a8207b1ce 100644 --- a/MagickCore/matrix.c +++ b/MagickCore/matrix.c @@ -133,7 +133,7 @@ static inline MagickOffsetType WriteMatrixElements( const MatrixInfo *magick_restrict matrix_info,const MagickOffsetType offset, const MagickSizeType length,const unsigned char *magick_restrict buffer) { - register MagickOffsetType + MagickOffsetType i; ssize_t @@ -320,7 +320,7 @@ MagickExport double **AcquireMagickMatrix(const size_t number_rows, double **matrix; - register ssize_t + ssize_t i, j; @@ -494,7 +494,7 @@ MagickPrivate MagickBooleanType GaussJordanElimination(double **matrix, max, scale; - register ssize_t + ssize_t i, j, k; @@ -665,7 +665,7 @@ static inline MagickOffsetType ReadMatrixElements( const MatrixInfo *magick_restrict matrix_info,const MagickOffsetType offset, const MagickSizeType length,unsigned char *magick_restrict buffer) { - register MagickOffsetType + MagickOffsetType i; ssize_t @@ -830,7 +830,7 @@ MagickPrivate void LeastSquaresAddTerms(double **matrix,double **vectors, const double *terms,const double *results,const size_t rank, const size_t number_vectors) { - register ssize_t + ssize_t i, j; @@ -902,7 +902,7 @@ MagickExport Image *MatrixToImage(const MatrixInfo *matrix_info, max_value=min_value; for (y=0; y < (ssize_t) matrix_info->rows; y++) { - register ssize_t + ssize_t x; for (x=0; x < (ssize_t) matrix_info->columns; x++) @@ -947,10 +947,10 @@ MagickExport Image *MatrixToImage(const MatrixInfo *matrix_info, double value; - register Quantum + Quantum *q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1002,7 +1002,7 @@ MagickExport Image *MatrixToImage(const MatrixInfo *matrix_info, */ MagickExport MagickBooleanType NullMatrix(MatrixInfo *matrix_info) { - register ssize_t + ssize_t x; ssize_t @@ -1066,7 +1066,7 @@ MagickExport MagickBooleanType NullMatrix(MatrixInfo *matrix_info) MagickExport double **RelinquishMagickMatrix(double **matrix, const size_t number_rows) { - register ssize_t + ssize_t i; if (matrix == (double **) NULL ) diff --git a/MagickCore/memory.c b/MagickCore/memory.c index 827847b7f..4bbf0905c 100644 --- a/MagickCore/memory.c +++ b/MagickCore/memory.c @@ -377,7 +377,7 @@ MagickExport void *AcquireAlignedMemory(const size_t count,const size_t quantum) static inline size_t AllocationPolicy(size_t size) { - register size_t + size_t blocksize; /* @@ -405,7 +405,7 @@ static inline size_t AllocationPolicy(size_t size) static inline void InsertFreeBlock(void *block,const size_t i) { - register void + void *next, *previous; @@ -432,7 +432,7 @@ static inline void InsertFreeBlock(void *block,const size_t i) static inline void RemoveFreeBlock(void *block,const size_t i) { - register void + void *next, *previous; @@ -448,10 +448,10 @@ static inline void RemoveFreeBlock(void *block,const size_t i) static void *AcquireBlock(size_t size) { - register size_t + size_t i; - register void + void *block; /* @@ -524,7 +524,7 @@ static void *AcquireBlock(size_t size) */ MagickExport void *AcquireMagickMemory(const size_t size) { - register void + void *memory; #if !defined(MAGICKCORE_ANONYMOUS_MEMORY_SUPPORT) @@ -537,7 +537,7 @@ MagickExport void *AcquireMagickMemory(const size_t size) LockSemaphoreInfo(memory_semaphore); if (free_segments == (DataSegmentInfo *) NULL) { - register ssize_t + ssize_t i; assert(2*sizeof(size_t) > (size_t) (~SizeMask)); @@ -598,7 +598,7 @@ MagickExport void *AcquireMagickMemory(const size_t size) */ MagickExport void *AcquireCriticalMemory(const size_t size) { - register void + void *memory; /* @@ -810,10 +810,10 @@ MagickExport MemoryInfo *AcquireVirtualMemory(const size_t count, MagickExport void *CopyMagickMemory(void *magick_restrict destination, const void *magick_restrict source,const size_t size) { - register const unsigned char + const unsigned char *p; - register unsigned char + unsigned char *q; assert(destination != (void *) NULL); @@ -858,7 +858,7 @@ MagickExport void *CopyMagickMemory(void *magick_restrict destination, MagickExport void DestroyMagickMemory(void) { #if defined(MAGICKCORE_ANONYMOUS_MEMORY_SUPPORT) - register ssize_t + ssize_t i; if (memory_semaphore == (SemaphoreInfo *) NULL) @@ -910,10 +910,10 @@ static MagickBooleanType ExpandHeap(size_t size) MagickBooleanType mapped; - register ssize_t + ssize_t i; - register void + void *block; size_t @@ -1340,7 +1340,7 @@ MagickPrivate void ResetVirtualAnonymousMemory(void) #if defined(MAGICKCORE_ANONYMOUS_MEMORY_SUPPORT) static inline void *ResizeBlock(void *block,size_t size) { - register void + void *memory; if (block == (void *) NULL) @@ -1359,7 +1359,7 @@ static inline void *ResizeBlock(void *block,size_t size) MagickExport void *ResizeMagickMemory(void *memory,const size_t size) { - register void + void *block; if (memory == (void *) NULL) diff --git a/MagickCore/mime.c b/MagickCore/mime.c index 2e05b8465..d1f4cc957 100644 --- a/MagickCore/mime.c +++ b/MagickCore/mime.c @@ -223,13 +223,13 @@ MagickExport const MimeInfo *GetMimeInfo(const char *filename, EndianType endian; - register const MimeInfo + const MimeInfo *p; - register const unsigned char + const unsigned char *q; - register ssize_t + ssize_t i; ssize_t @@ -436,10 +436,10 @@ MagickExport const MimeInfo **GetMimeInfoList(const char *pattern, const MimeInfo **aliases; - register const MimeInfo + const MimeInfo *p; - register ssize_t + ssize_t i; /* @@ -512,7 +512,7 @@ extern "C" { static int MimeCompare(const void *x,const void *y) { - register char + char *p, *q; @@ -531,10 +531,10 @@ MagickExport char **GetMimeList(const char *pattern, char **aliases; - register const MimeInfo + const MimeInfo *p; - register ssize_t + ssize_t i; /* @@ -697,7 +697,7 @@ MagickExport MagickBooleanType ListMimeInfo(FILE *file,ExceptionInfo *exception) const MimeInfo **mime_info; - register ssize_t + ssize_t i; size_t @@ -874,7 +874,7 @@ static MagickBooleanType LoadMimeCache(LinkedListInfo *cache,const char *xml, const char *p; - register unsigned char + unsigned char *q; token=AcquireString(attribute); @@ -1054,7 +1054,7 @@ MagickPrivate MagickBooleanType MimeComponentGenesis(void) static void *DestroyMimeElement(void *mime_info) { - register MimeInfo + MimeInfo *p; p=(MimeInfo *) mime_info; diff --git a/MagickCore/module.c b/MagickCore/module.c index e270d34e8..789a9e54a 100644 --- a/MagickCore/module.c +++ b/MagickCore/module.c @@ -291,10 +291,10 @@ MagickExport const ModuleInfo **GetModuleInfoList(const char *pattern, const ModuleInfo **modules; - register const ModuleInfo + const ModuleInfo *p; - register ssize_t + ssize_t i; /* @@ -369,7 +369,7 @@ extern "C" { static int ModuleCompare(const void *x,const void *y) { - register const char + const char **p, **q; @@ -399,7 +399,7 @@ MagickExport char **GetModuleList(const char *pattern, MagickBooleanType status; - register ssize_t + ssize_t i; size_t @@ -566,7 +566,7 @@ static MagickBooleanType GetMagickModulePath(const char *filename, } if (module_path != (char *) NULL) { - register char + char *p, *q; @@ -850,7 +850,7 @@ static void *DestroyModuleNode(void *module_info) ExceptionInfo *exception; - register ModuleInfo + ModuleInfo *p; exception=AcquireExceptionInfo(); @@ -1073,7 +1073,7 @@ MagickExport MagickBooleanType ListModuleInfo(FILE *file, **modules, path[MagickPathExtent]; - register ssize_t + ssize_t i; size_t @@ -1238,7 +1238,7 @@ MagickPrivate MagickBooleanType OpenModule(const char *module, PolicyRights rights; - register const CoderInfo + const CoderInfo *p; size_t @@ -1361,7 +1361,7 @@ MagickPrivate MagickBooleanType OpenModules(ExceptionInfo *exception) char **modules; - register ssize_t + ssize_t i; size_t diff --git a/MagickCore/montage.c b/MagickCore/montage.c index 30eaff708..f95516bd5 100644 --- a/MagickCore/montage.c +++ b/MagickCore/montage.c @@ -363,7 +363,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, MagickStatusType flags; - register ssize_t + ssize_t i; RectangleInfo diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c index c58ee9fa3..792c5e3fd 100644 --- a/MagickCore/morphology.c +++ b/MagickCore/morphology.c @@ -223,7 +223,7 @@ static KernelInfo *ParseKernelArray(const char *kernel_string) *p, *end; - register ssize_t + ssize_t i; double @@ -954,10 +954,10 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, KernelInfo *kernel; - register ssize_t + ssize_t i; - register ssize_t + ssize_t u, v; @@ -2212,7 +2212,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, */ MagickExport KernelInfo *CloneKernelInfo(const KernelInfo *kernel) { - register ssize_t + ssize_t i; KernelInfo @@ -2311,9 +2311,9 @@ static void FlopKernelInfo(KernelInfo *kernel) { /* Do a Flop by reversing each row. */ size_t y; - register ssize_t + ssize_t x,r; - register double + double *k,t; for ( y=0, k=kernel->values; y < kernel->height; y++, k+=kernel->width) @@ -2392,7 +2392,7 @@ static void ExpandMirrorKernelInfo(KernelInfo *kernel) static MagickBooleanType SameKernelInfo(const KernelInfo *kernel1, const KernelInfo *kernel2) { - register size_t + size_t i; /* check size and origin location */ @@ -2480,7 +2480,7 @@ RestoreMSCWarning */ static void CalcKernelMetaData(KernelInfo *kernel) { - register size_t + size_t i; kernel->minimum = kernel->maximum = 0.0; @@ -2572,7 +2572,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, OffsetInfo offset; - register ssize_t + ssize_t j, y; @@ -2642,7 +2642,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, if ((method == ConvolveMorphology) && (kernel->width == 1)) { - register ssize_t + ssize_t x; /* @@ -2660,13 +2660,13 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, const int id = GetOpenMPThreadId(); - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t r; ssize_t @@ -2686,7 +2686,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, center=(ssize_t) GetPixelChannels(image)*offset.y; for (r=0; r < (ssize_t) image->rows; r++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -2703,13 +2703,13 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, morphology_traits, traits; - register const MagickRealType + const MagickRealType *magick_restrict k; - register const Quantum + const Quantum *magick_restrict pixels; - register ssize_t + ssize_t v; size_t @@ -2806,13 +2806,13 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, const int id = GetOpenMPThreadId(); - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; ssize_t @@ -2833,7 +2833,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, GetPixelChannels(image)*offset.x); for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -2853,14 +2853,14 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, morphology_traits, traits; - register const MagickRealType + const MagickRealType *magick_restrict k; - register const Quantum + const Quantum *magick_restrict pixels, *magick_restrict quantum_pixels; - register ssize_t + ssize_t u; size_t @@ -3306,13 +3306,13 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, width=image->columns+kernel->width-1; for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; /* @@ -3336,7 +3336,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -3350,13 +3350,13 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, PixelTrait traits; - register const MagickRealType + const MagickRealType *magick_restrict k; - register const Quantum + const Quantum *magick_restrict pixels; - register ssize_t + ssize_t u; ssize_t @@ -3469,13 +3469,13 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, morphology_view=AcquireAuthenticCacheView(image,exception); for (y=(ssize_t) image->rows-1; y >= 0; y--) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; /* @@ -3500,7 +3500,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, q+=(image->columns-1)*GetPixelChannels(image); for (x=(ssize_t) image->columns-1; x >= 0; x--) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -3514,13 +3514,13 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, PixelTrait traits; - register const MagickRealType + const MagickRealType *magick_restrict k; - register const Quantum + const Quantum *magick_restrict pixels; - register ssize_t + ssize_t u; ssize_t @@ -4365,10 +4365,10 @@ static void RotateKernelInfo(KernelInfo *kernel, double angle) } else if ( kernel->width == kernel->height ) { /* Rotate a square array of values by 90 degrees */ - { register ssize_t + { ssize_t i,j,x,y; - register MagickRealType + MagickRealType *k,t; k=kernel->values; @@ -4382,7 +4382,7 @@ static void RotateKernelInfo(KernelInfo *kernel, double angle) } } /* rotate the origin - relative to center of array */ - { register ssize_t x,y; + { ssize_t x,y; x = (ssize_t) (kernel->x*2-kernel->width+1); y = (ssize_t) (kernel->y*2-kernel->height+1); kernel->x = (ssize_t) ( -y +(ssize_t) kernel->width-1)/2; @@ -4404,7 +4404,7 @@ static void RotateKernelInfo(KernelInfo *kernel, double angle) MagickRealType t; - register MagickRealType + MagickRealType *k; ssize_t @@ -4572,11 +4572,11 @@ MagickExport void ScaleGeometryKernelInfo (KernelInfo *kernel, MagickExport void ScaleKernelInfo(KernelInfo *kernel, const double scaling_factor,const GeometryFlags normalize_flags) { - register double + double pos_scale, neg_scale; - register ssize_t + ssize_t i; /* do the other kernels in a multi-kernel list first */ @@ -4776,7 +4776,7 @@ MagickExport void UnityAddKernelInfo(KernelInfo *kernel, */ MagickPrivate void ZeroKernelNans(KernelInfo *kernel) { - register size_t + size_t i; /* do the other kernels in a multi-kernel list first */ diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c index 061ce6c05..489dc7740 100644 --- a/MagickCore/nt-base.c +++ b/MagickCore/nt-base.c @@ -1328,7 +1328,7 @@ MagickPrivate const GhostInfo *NTGhostscriptDLLVectors(void) */ MagickPrivate void NTGhostscriptEXE(char *path,int length) { - register char + char *p; static char @@ -1402,7 +1402,7 @@ MagickPrivate int NTGhostscriptFonts(char *path,int length) *directory, filename[MagickPathExtent]; - register char + char *p, *q; @@ -1901,7 +1901,7 @@ MagickPrivate void *NTOpenLibrary(const char *filename) char path[MagickPathExtent]; - register const char + const char *p, *q; diff --git a/MagickCore/opencl.c b/MagickCore/opencl.c index abf646709..0a24a9b30 100644 --- a/MagickCore/opencl.c +++ b/MagickCore/opencl.c @@ -1436,7 +1436,7 @@ static cl_event* CopyOpenCLEvents(MagickCLCacheInfo first, cl_event *events; - register size_t + size_t i; size_t diff --git a/MagickCore/option.c b/MagickCore/option.c index f2e5d2a26..29811c1f2 100644 --- a/MagickCore/option.c +++ b/MagickCore/option.c @@ -2205,7 +2205,7 @@ MagickExport MagickBooleanType DefineImageOption(ImageInfo *image_info, key[MagickPathExtent], value[MagickPathExtent]; - register char + char *p; assert(image_info != (ImageInfo *) NULL); @@ -2457,13 +2457,13 @@ MagickExport ssize_t GetCommandOptionFlags(const CommandOption option, MagickBooleanType negate; - register char + char *q; - register const char + const char *p; - register ssize_t + ssize_t i; ssize_t @@ -2550,7 +2550,7 @@ MagickExport ssize_t GetCommandOptionFlags(const CommandOption option, */ MagickExport const OptionInfo *GetCommandOptionInfo(const char *option) { - register ssize_t + ssize_t i; for (i=0; CommandOptions[i].mnemonic != (char *) NULL; i++) @@ -2589,7 +2589,7 @@ MagickExport char **GetCommandOptions(const CommandOption option) const OptionInfo *option_info; - register ssize_t + ssize_t i; option_info=GetOptionInfo(option); @@ -2707,7 +2707,7 @@ MagickExport const char *CommandOptionToMnemonic(const CommandOption option, const OptionInfo *option_info; - register ssize_t + ssize_t i; option_info=GetOptionInfo(option); @@ -2760,7 +2760,7 @@ MagickExport MagickBooleanType IsOptionMember(const char *option, MagickBooleanType member; - register ssize_t + ssize_t i; /* @@ -2827,7 +2827,7 @@ MagickExport MagickBooleanType ListCommandOptions(FILE *file, const OptionInfo *option_info; - register ssize_t + ssize_t i; magick_unreferenced(exception); @@ -2870,7 +2870,7 @@ MagickExport MagickBooleanType ListCommandOptions(FILE *file, */ MagickExport ssize_t ParseChannelOption(const char *channels) { - register ssize_t + ssize_t i; size_t @@ -3008,13 +3008,13 @@ MagickExport ssize_t ParseCommandOption(const CommandOption option, MagickBooleanType negate; - register char + char *q; - register const char + const char *p; - register ssize_t + ssize_t i; ssize_t diff --git a/MagickCore/paint.c b/MagickCore/paint.c index 7ea0d6236..efb8ccec5 100644 --- a/MagickCore/paint.c +++ b/MagickCore/paint.c @@ -150,7 +150,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image, fill_color, pixel; - register SegmentInfo + SegmentInfo *s; SegmentInfo @@ -215,13 +215,13 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image, floodplane_view=AcquireAuthenticCacheView(floodplane_image,exception); while (s > segment_stack) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; /* @@ -321,13 +321,13 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image, status=MagickTrue; for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; /* @@ -647,7 +647,7 @@ MagickExport MagickBooleanType GradientImage(Image *image, static size_t **DestroyHistogramThreadSet(size_t **histogram) { - register ssize_t + ssize_t i; assert(histogram != (size_t **) NULL); @@ -660,7 +660,7 @@ static size_t **DestroyHistogramThreadSet(size_t **histogram) static size_t **AcquireHistogramThreadSet(const size_t count) { - register ssize_t + ssize_t i; size_t @@ -757,16 +757,16 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius, #endif for (y=0; y < (ssize_t) linear_image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register size_t + size_t *histogram; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -783,7 +783,7 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius, histogram=histograms[GetOpenMPThreadId()]; for (x=0; x < (ssize_t) linear_image->columns; x++) { - register ssize_t + ssize_t i, u; @@ -951,10 +951,10 @@ MagickExport MagickBooleanType OpaquePaintImage(Image *image, PixelInfo pixel; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1098,10 +1098,10 @@ MagickExport MagickBooleanType TransparentPaintImage(Image *image, PixelInfo pixel; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -1229,10 +1229,10 @@ MagickExport MagickBooleanType TransparentPaintImageChroma(Image *image, PixelInfo pixel; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c index 85bf51e1f..d2c886704 100644 --- a/MagickCore/pixel.c +++ b/MagickCore/pixel.c @@ -95,7 +95,7 @@ MagickExport PixelChannelMap *AcquirePixelChannelMap(void) PixelChannelMap *channel_map; - register ssize_t + ssize_t i; channel_map=(PixelChannelMap *) AcquireQuantumMemory(MaxPixelChannels, @@ -510,13 +510,13 @@ static MagickBooleanType ExportCharPixel(const Image *image, const RectangleInfo *roi,const char *magick_restrict map, const QuantumType *quantum_map,void *pixels,ExceptionInfo *exception) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register unsigned char + unsigned char *magick_restrict q; size_t @@ -655,7 +655,7 @@ static MagickBooleanType ExportCharPixel(const Image *image, break; for (x=0; x < (ssize_t) roi->width; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i++) @@ -717,13 +717,13 @@ static MagickBooleanType ExportDoublePixel(const Image *image, const RectangleInfo *roi,const char *magick_restrict map, const QuantumType *quantum_map,void *pixels,ExceptionInfo *exception) { - register const Quantum + const Quantum *magick_restrict p; - register double + double *magick_restrict q; - register ssize_t + ssize_t x; size_t @@ -862,7 +862,7 @@ static MagickBooleanType ExportDoublePixel(const Image *image, break; for (x=0; x < (ssize_t) roi->width; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i++) @@ -925,13 +925,13 @@ static MagickBooleanType ExportFloatPixel(const Image *image, const RectangleInfo *roi,const char *magick_restrict map, const QuantumType *quantum_map,void *pixels,ExceptionInfo *exception) { - register const Quantum + const Quantum *magick_restrict p; - register float + float *magick_restrict q; - register ssize_t + ssize_t x; size_t @@ -1070,7 +1070,7 @@ static MagickBooleanType ExportFloatPixel(const Image *image, break; for (x=0; x < (ssize_t) roi->width; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i++) @@ -1132,13 +1132,13 @@ static MagickBooleanType ExportLongPixel(const Image *image, const RectangleInfo *roi,const char *magick_restrict map, const QuantumType *quantum_map,void *pixels,ExceptionInfo *exception) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register unsigned int + unsigned int *magick_restrict q; size_t @@ -1277,7 +1277,7 @@ static MagickBooleanType ExportLongPixel(const Image *image, break; for (x=0; x < (ssize_t) roi->width; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i++) @@ -1339,13 +1339,13 @@ static MagickBooleanType ExportLongLongPixel(const Image *image, const RectangleInfo *roi,const char *magick_restrict map, const QuantumType *quantum_map,void *pixels,ExceptionInfo *exception) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register MagickSizeType + MagickSizeType *magick_restrict q; size_t @@ -1485,7 +1485,7 @@ static MagickBooleanType ExportLongLongPixel(const Image *image, break; for (x=0; x < (ssize_t) roi->width; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i++) @@ -1548,13 +1548,13 @@ static MagickBooleanType ExportQuantumPixel(const Image *image, const RectangleInfo *roi,const char *magick_restrict map, const QuantumType *quantum_map,void *pixels,ExceptionInfo *exception) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; size_t @@ -1693,7 +1693,7 @@ static MagickBooleanType ExportQuantumPixel(const Image *image, break; for (x=0; x < (ssize_t) roi->width; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i++) @@ -1758,13 +1758,13 @@ static MagickBooleanType ExportShortPixel(const Image *image, const RectangleInfo *roi,const char *magick_restrict map, const QuantumType *quantum_map,void *pixels,ExceptionInfo *exception) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register unsigned short + unsigned short *magick_restrict q; size_t @@ -1903,7 +1903,7 @@ static MagickBooleanType ExportShortPixel(const Image *image, break; for (x=0; x < (ssize_t) roi->width; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i++) @@ -1974,7 +1974,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image, RectangleInfo roi; - register ssize_t + ssize_t i; size_t @@ -2512,13 +2512,13 @@ static MagickBooleanType ImportCharPixel(Image *image,const RectangleInfo *roi, const char *magick_restrict map,const QuantumType *quantum_map, const void *pixels,ExceptionInfo *exception) { - register const unsigned char + const unsigned char *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; size_t @@ -2711,7 +2711,7 @@ static MagickBooleanType ImportCharPixel(Image *image,const RectangleInfo *roi, break; for (x=0; x < (ssize_t) roi->width; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i++) @@ -2773,13 +2773,13 @@ static MagickBooleanType ImportDoublePixel(Image *image, const RectangleInfo *roi,const char *magick_restrict map, const QuantumType *quantum_map,const void *pixels,ExceptionInfo *exception) { - register const double + const double *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; size_t @@ -2952,7 +2952,7 @@ static MagickBooleanType ImportDoublePixel(Image *image, break; for (x=0; x < (ssize_t) roi->width; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i++) @@ -3014,13 +3014,13 @@ static MagickBooleanType ImportFloatPixel(Image *image,const RectangleInfo *roi, const char *magick_restrict map,const QuantumType *quantum_map, const void *pixels,ExceptionInfo *exception) { - register const float + const float *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; size_t @@ -3193,7 +3193,7 @@ static MagickBooleanType ImportFloatPixel(Image *image,const RectangleInfo *roi, break; for (x=0; x < (ssize_t) roi->width; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i++) @@ -3255,13 +3255,13 @@ static MagickBooleanType ImportLongPixel(Image *image,const RectangleInfo *roi, const char *magick_restrict map,const QuantumType *quantum_map, const void *pixels,ExceptionInfo *exception) { - register const unsigned int + const unsigned int *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; size_t @@ -3414,7 +3414,7 @@ static MagickBooleanType ImportLongPixel(Image *image,const RectangleInfo *roi, break; for (x=0; x < (ssize_t) roi->width; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i++) @@ -3476,13 +3476,13 @@ static MagickBooleanType ImportLongLongPixel(Image *image, const RectangleInfo *roi,const char *magick_restrict map, const QuantumType *quantum_map,const void *pixels,ExceptionInfo *exception) { - register const MagickSizeType + const MagickSizeType *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; size_t @@ -3635,7 +3635,7 @@ static MagickBooleanType ImportLongLongPixel(Image *image, break; for (x=0; x < (ssize_t) roi->width; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i++) @@ -3697,13 +3697,13 @@ static MagickBooleanType ImportQuantumPixel(Image *image, const RectangleInfo *roi,const char *magick_restrict map, const QuantumType *quantum_map,const void *pixels,ExceptionInfo *exception) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; size_t @@ -3856,7 +3856,7 @@ static MagickBooleanType ImportQuantumPixel(Image *image, break; for (x=0; x < (ssize_t) roi->width; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i++) @@ -3918,13 +3918,13 @@ static MagickBooleanType ImportShortPixel(Image *image,const RectangleInfo *roi, const char *magick_restrict map,const QuantumType *quantum_map, const void *pixels,ExceptionInfo *exception) { - register const unsigned short + const unsigned short *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; size_t @@ -4077,7 +4077,7 @@ static MagickBooleanType ImportShortPixel(Image *image,const RectangleInfo *roi, break; for (x=0; x < (ssize_t) roi->width; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i++) @@ -4148,7 +4148,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,const ssize_t x, RectangleInfo roi; - register ssize_t + ssize_t i; size_t @@ -4336,7 +4336,7 @@ MagickExport void InitializePixelChannelMap(Image *image) PixelTrait trait; - register ssize_t + ssize_t i; ssize_t @@ -4508,10 +4508,10 @@ MagickExport MagickBooleanType InterpolatePixelChannel( PixelTrait traits; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t i; ssize_t @@ -4927,10 +4927,10 @@ MagickExport MagickBooleanType InterpolatePixelChannels( gamma, pixels[16]; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t i; ssize_t @@ -4985,7 +4985,7 @@ MagickExport MagickBooleanType InterpolatePixelChannels( double sum; - register ssize_t + ssize_t j; PixelChannel channel = GetPixelChannelChannel(source,i); @@ -5087,7 +5087,7 @@ MagickExport MagickBooleanType InterpolatePixelChannels( } for (i=0; i < (ssize_t) GetPixelChannels(source); i++) { - register ssize_t + ssize_t j; PixelChannel channel = GetPixelChannelChannel(source,i); @@ -5164,7 +5164,7 @@ MagickExport MagickBooleanType InterpolatePixelChannels( } for (i=0; i < (ssize_t) GetPixelChannels(source); i++) { - register ssize_t + ssize_t j; PixelChannel channel = GetPixelChannelChannel(source,i); @@ -5371,7 +5371,7 @@ MagickExport MagickBooleanType InterpolatePixelChannels( } for (i=0; i < (ssize_t) GetPixelChannels(source); i++) { - register ssize_t + ssize_t j; PixelChannel channel = GetPixelChannelChannel(source,i); @@ -5494,10 +5494,10 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image, PixelInfo pixels[16]; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i; ssize_t @@ -5960,7 +5960,7 @@ MagickExport MagickBooleanType IsFuzzyEquivalencePixel(const Image *source, fuzz, pixel; - register double + double distance, scale; @@ -6069,7 +6069,7 @@ MagickExport MagickBooleanType IsFuzzyEquivalencePixelInfo(const PixelInfo *p, fuzz, pixel; - register double + double scale, distance; @@ -6172,7 +6172,7 @@ MagickExport MagickBooleanType IsFuzzyEquivalencePixelInfo(const PixelInfo *p, static void LogPixelChannels(const Image *image) { - register ssize_t + ssize_t i; (void) LogMagickEvent(PixelEvent,GetMagickModule(),"%s[%08x]", @@ -6285,7 +6285,7 @@ MagickExport ChannelType SetPixelChannelMask(Image *image, ChannelType mask; - register ssize_t + ssize_t i; assert(image != (Image *) NULL); diff --git a/MagickCore/policy.c b/MagickCore/policy.c index fed703435..e428d4796 100644 --- a/MagickCore/policy.c +++ b/MagickCore/policy.c @@ -176,7 +176,7 @@ static LinkedListInfo *AcquirePolicyCache(const char *filename, MagickStatusType status; - register ssize_t + ssize_t i; /* @@ -215,7 +215,7 @@ static LinkedListInfo *AcquirePolicyCache(const char *filename, PolicyInfo *policy_info; - register const PolicyMapInfo + const PolicyMapInfo *p; p=PolicyMap+i; @@ -277,10 +277,10 @@ static PolicyInfo *GetPolicyInfo(const char *name,ExceptionInfo *exception) PolicyDomain domain; - register PolicyInfo + PolicyInfo *p; - register char + char *q; assert(exception != (ExceptionInfo *) NULL); @@ -371,10 +371,10 @@ MagickExport const PolicyInfo **GetPolicyInfoList(const char *pattern, const PolicyInfo **policies; - register const PolicyInfo + const PolicyInfo *p; - register ssize_t + ssize_t i; /* @@ -466,10 +466,10 @@ MagickExport char **GetPolicyList(const char *pattern,size_t *number_policies, char **policies; - register const PolicyInfo + const PolicyInfo *p; - register ssize_t + ssize_t i; /* @@ -628,7 +628,7 @@ MagickExport MagickBooleanType IsRightsAuthorized(const PolicyDomain domain, MagickBooleanType authorized; - register PolicyInfo + PolicyInfo *p; if (IsEventLogging() != MagickFalse) @@ -700,7 +700,7 @@ MagickExport MagickBooleanType ListPolicyInfo(FILE *file, const PolicyInfo **policy_info; - register ssize_t + ssize_t i; size_t @@ -1037,7 +1037,7 @@ MagickPrivate MagickBooleanType PolicyComponentGenesis(void) static void *DestroyPolicyElement(void *policy_info) { - register PolicyInfo + PolicyInfo *p; p=(PolicyInfo *) policy_info; @@ -1162,7 +1162,7 @@ static MagickBooleanType SetPolicyValue(const PolicyDomain domain, MagickBooleanType status; - register PolicyInfo + PolicyInfo *p; status=MagickTrue; diff --git a/MagickCore/prepress.c b/MagickCore/prepress.c index c5beb3af3..bb0f5802d 100644 --- a/MagickCore/prepress.c +++ b/MagickCore/prepress.c @@ -120,10 +120,10 @@ MagickExport double GetImageTotalInkDensity(Image *image, double density; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); diff --git a/MagickCore/profile.c b/MagickCore/profile.c index 8b3e91c7b..2af20ba06 100644 --- a/MagickCore/profile.c +++ b/MagickCore/profile.c @@ -401,7 +401,7 @@ static void cmsDeleteContext(cmsContext magick_unused(ContextID)) static void **DestroyPixelThreadSet(void **pixels) { - register ssize_t + ssize_t i; if (pixels == (void **) NULL) @@ -416,7 +416,7 @@ static void **DestroyPixelThreadSet(void **pixels) static void **AcquirePixelThreadSet(const size_t columns, const size_t channels,MagickBooleanType highres) { - register ssize_t + ssize_t i; size_t @@ -447,7 +447,7 @@ static void **AcquirePixelThreadSet(const size_t columns, static cmsHTRANSFORM *DestroyTransformThreadSet(cmsHTRANSFORM *transform) { - register ssize_t + ssize_t i; assert(transform != (cmsHTRANSFORM *) NULL); @@ -465,7 +465,7 @@ static cmsHTRANSFORM *AcquireTransformThreadSet(const LCMSInfo *source_info, cmsHTRANSFORM *transform; - register ssize_t + ssize_t i; size_t @@ -530,10 +530,10 @@ static void TransformDoublePixels(const int id,const Image* image, #define SetLCMSPixel(target_info,pixel) \ ClampToQuantum(target_info->scale*QuantumRange*(pixel)+target_info->translate) - register double + double *p; - register ssize_t + ssize_t x; p=(double *) source_info->pixels[id]; @@ -580,10 +580,10 @@ static void TransformQuantumPixels(const int id,const Image* image, const LCMSInfo *source_info,const LCMSInfo *target_info, const cmsHTRANSFORM *transform,Quantum *q) { - register Quantum + Quantum *p; - register ssize_t + ssize_t x; p=(Quantum *) source_info->pixels[id]; @@ -1354,7 +1354,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name, MagickBooleanType sync; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -1589,7 +1589,7 @@ static void WriteTo8BimProfile(Image *image,const char *name, *datum, *q; - register const unsigned char + const unsigned char *p; size_t @@ -1697,7 +1697,7 @@ static void GetProfilesFromResourceBlock(Image *image, const unsigned char *datum; - register const unsigned char + const unsigned char *p; size_t @@ -1842,7 +1842,7 @@ static void GetProfilesFromResourceBlock(Image *image, static void PatchCorruptProfile(const char *name,StringInfo *profile) { - register unsigned char + unsigned char *p; size_t @@ -2317,7 +2317,7 @@ MagickBooleanType SyncExifProfile(Image *image,StringInfo *profile) int components; - register unsigned char + unsigned char *p, *q; @@ -2454,7 +2454,7 @@ static void UpdateClipPath(unsigned char *blob,size_t length, const size_t old_columns,const size_t old_rows, const RectangleInfo *new_geometry) { - register ssize_t + ssize_t i; ssize_t diff --git a/MagickCore/property.c b/MagickCore/property.c index 4116e9bb9..e651a418e 100644 --- a/MagickCore/property.c +++ b/MagickCore/property.c @@ -236,7 +236,7 @@ MagickExport MagickBooleanType DefineImageProperty(Image *image, key[MagickPathExtent], value[MagickPathExtent]; - register char + char *p; assert(image != (Image *) NULL); @@ -434,7 +434,7 @@ static MagickBooleanType GetIPTCProperty(const Image *image,const char *key, dataset, record; - register ssize_t + ssize_t i; size_t @@ -513,7 +513,7 @@ static inline signed int ReadPropertyMSBLong(const unsigned char **p, int c; - register ssize_t + ssize_t i; unsigned char @@ -553,7 +553,7 @@ static inline signed short ReadPropertyMSBShort(const unsigned char **p, int c; - register ssize_t + ssize_t i; unsigned char @@ -598,7 +598,7 @@ static MagickBooleanType Get8BIMProperty(const Image *image,const char *key, MagickBooleanType status; - register ssize_t + ssize_t i; size_t @@ -1239,7 +1239,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image, MagickBooleanType status; - register ssize_t + ssize_t i; size_t @@ -1423,7 +1423,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image, number_entries=(size_t) ReadPropertyUnsignedShort(endian,directory); for ( ; entry < number_entries; entry++) { - register unsigned char + unsigned char *p, *q; @@ -1785,7 +1785,7 @@ static MagickBooleanType GetXMPProperty(const Image *image,const char *property) MagickBooleanType status; - register const char + const char *p; XMLTreeInfo @@ -1875,7 +1875,7 @@ static char *TracePSClippath(const unsigned char *blob,size_t length) last[3], point[3]; - register ssize_t + ssize_t i, x; @@ -2092,7 +2092,7 @@ static char *TraceSVGClippath(const unsigned char *blob,size_t length, last[3], point[3]; - register ssize_t + ssize_t i; ssize_t @@ -2220,7 +2220,7 @@ MagickExport const char *GetImageProperty(const Image *image, MagickBooleanType read_from_properties; - register const char + const char *p; size_t @@ -2923,7 +2923,7 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, PointInfo *convex_hull; - register ssize_t + ssize_t n; size_t @@ -3115,7 +3115,7 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, PointInfo *bounding_box; - register ssize_t + ssize_t n; size_t @@ -3587,10 +3587,10 @@ MagickExport char *InterpretImageProperties(ImageInfo *image_info,Image *image, MagickBooleanType number; - register char + char *q; /* current position in interpret_text */ - register const char + const char *p; /* position in embed_text string being expanded */ size_t @@ -3771,7 +3771,7 @@ MagickExport char *InterpretImageProperties(ImageInfo *image_info,Image *image, *key, *string; - register ssize_t + ssize_t len; ssize_t diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c index 8cee68907..367cff791 100644 --- a/MagickCore/quantize.c +++ b/MagickCore/quantize.c @@ -540,10 +540,10 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info, CubeInfo cube; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; ssize_t @@ -564,10 +564,10 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info, DoublePixelPacket pixel; - register const NodeInfo + const NodeInfo *node_info; - register ssize_t + ssize_t i; size_t @@ -805,10 +805,10 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info, image_view=AcquireVirtualCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); @@ -912,10 +912,10 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info, } for (y++; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); @@ -1095,7 +1095,7 @@ MagickExport QuantizeInfo *CloneQuantizeInfo(const QuantizeInfo *quantize_info) static void ClosestColor(const Image *image,CubeInfo *cube_info, const NodeInfo *node_info) { - register ssize_t + ssize_t i; size_t @@ -1113,15 +1113,15 @@ static void ClosestColor(const Image *image,CubeInfo *cube_info, double pixel; - register double + double alpha, beta, distance; - register DoublePixelPacket + DoublePixelPacket *magick_restrict q; - register PixelInfo + PixelInfo *magick_restrict p; /* @@ -1241,7 +1241,7 @@ MagickExport MagickBooleanType CompressImageColormap(Image *image, static void DefineImageColormap(Image *image,CubeInfo *cube_info, NodeInfo *node_info) { - register ssize_t + ssize_t i; size_t @@ -1256,10 +1256,10 @@ static void DefineImageColormap(Image *image,CubeInfo *cube_info, DefineImageColormap(image,cube_info,node_info->child[i]); if (node_info->number_unique != 0) { - register double + double alpha; - register PixelInfo + PixelInfo *magick_restrict q; /* @@ -1342,7 +1342,7 @@ static void DefineImageColormap(Image *image,CubeInfo *cube_info, */ static void DestroyCubeInfo(CubeInfo *cube_info) { - register Nodes + Nodes *nodes; /* @@ -1429,7 +1429,7 @@ MagickExport QuantizeInfo *DestroyQuantizeInfo(QuantizeInfo *quantize_info) static DoublePixelPacket **DestroyPixelThreadSet(DoublePixelPacket **pixels) { - register ssize_t + ssize_t i; assert(pixels != (DoublePixelPacket **) NULL); @@ -1445,7 +1445,7 @@ static DoublePixelPacket **AcquirePixelThreadSet(const size_t count) DoublePixelPacket **pixels; - register ssize_t + ssize_t i; size_t @@ -1533,10 +1533,10 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info, *current, *previous; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; size_t @@ -1563,7 +1563,7 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info, color, pixel; - register ssize_t + ssize_t i; ssize_t @@ -1611,10 +1611,10 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info, i=CacheOffset(&cube,&pixel); if (cube.cache[i] < 0) { - register NodeInfo + NodeInfo *node_info; - register size_t + size_t node_id; /* @@ -1828,7 +1828,7 @@ static MagickBooleanType RiemersmaDither(Image *image,CacheView *image_view, MagickBooleanType proceed; - register CubeInfo + CubeInfo *p; size_t @@ -1838,10 +1838,10 @@ static MagickBooleanType RiemersmaDither(Image *image,CacheView *image_view, if ((p->x >= 0) && (p->x < (ssize_t) image->columns) && (p->y >= 0) && (p->y < (ssize_t) image->rows)) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t i; /* @@ -1867,10 +1867,10 @@ static MagickBooleanType RiemersmaDither(Image *image,CacheView *image_view, i=CacheOffset(cube_info,&pixel); if (p->cache[i] < 0) { - register NodeInfo + NodeInfo *node_info; - register size_t + size_t id; /* @@ -1944,7 +1944,7 @@ static MagickBooleanType DitherImage(Image *image,CubeInfo *cube_info, MagickBooleanType status; - register ssize_t + ssize_t i; size_t @@ -2017,7 +2017,7 @@ static CubeInfo *GetCubeInfo(const QuantizeInfo *quantize_info, sum, weight; - register ssize_t + ssize_t i; size_t @@ -2225,10 +2225,10 @@ MagickExport MagickBooleanType GetImageQuantizeError(Image *image, image_view=AcquireVirtualCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); @@ -2353,7 +2353,7 @@ typedef struct _KmeansInfo static KmeansInfo **DestroyKmeansThreadSet(KmeansInfo **kmeans_info) { - register ssize_t + ssize_t i; assert(kmeans_info != (KmeansInfo **) NULL); @@ -2369,7 +2369,7 @@ static KmeansInfo **AcquireKmeansThreadSet(const size_t number_colors) KmeansInfo **kmeans_info; - register ssize_t + ssize_t i; size_t @@ -2394,7 +2394,7 @@ static KmeansInfo **AcquireKmeansThreadSet(const size_t number_colors) static inline double KmeansMetric(const Image *magick_restrict image, const Quantum *magick_restrict p,const PixelInfo *magick_restrict q) { - register double + double gamma, metric, pixel; @@ -2458,7 +2458,7 @@ MagickExport MagickBooleanType KmeansImage(Image *image, verbose, status; - register ssize_t + ssize_t n; size_t @@ -2517,7 +2517,7 @@ MagickExport MagickBooleanType KmeansImage(Image *image, char color[MagickPathExtent]; - register const char + const char *p; /* @@ -2528,7 +2528,7 @@ MagickExport MagickBooleanType KmeansImage(Image *image, return(status); for (n=0, p=colors; n < (ssize_t) image->colors; n++) { - register const char + const char *q; for (q=p; *q != '\0'; q++) @@ -2585,7 +2585,7 @@ MagickExport MagickBooleanType KmeansImage(Image *image, double distortion; - register ssize_t + ssize_t i; ssize_t @@ -2602,10 +2602,10 @@ MagickExport MagickBooleanType KmeansImage(Image *image, const int id = GetOpenMPThreadId(); - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2621,7 +2621,7 @@ MagickExport MagickBooleanType KmeansImage(Image *image, double min_distance; - register ssize_t + ssize_t i; ssize_t @@ -2668,7 +2668,7 @@ MagickExport MagickBooleanType KmeansImage(Image *image, */ for (i=1; i < (ssize_t) number_threads; i++) { - register ssize_t + ssize_t j; for (j=0; j < (ssize_t) image->colors; j++) @@ -2793,7 +2793,7 @@ MagickExport MagickBooleanType PosterizeImage(Image *image,const size_t levels, QuantizeInfo *quantize_info; - register ssize_t + ssize_t i; ssize_t @@ -2840,10 +2840,10 @@ MagickExport MagickBooleanType PosterizeImage(Image *image,const size_t levels, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2927,7 +2927,7 @@ static void PruneChild(CubeInfo *cube_info,const NodeInfo *node_info) NodeInfo *parent; - register ssize_t + ssize_t i; size_t @@ -2980,7 +2980,7 @@ static void PruneChild(CubeInfo *cube_info,const NodeInfo *node_info) */ static void PruneLevel(CubeInfo *cube_info,const NodeInfo *node_info) { - register ssize_t + ssize_t i; size_t @@ -3025,7 +3025,7 @@ static void PruneLevel(CubeInfo *cube_info,const NodeInfo *node_info) */ static void PruneToCubeDepth(CubeInfo *cube_info,const NodeInfo *node_info) { - register ssize_t + ssize_t i; size_t @@ -3189,7 +3189,7 @@ MagickExport MagickBooleanType QuantizeImages(const QuantizeInfo *quantize_info, MagickProgressMonitor progress_monitor; - register ssize_t + ssize_t i; size_t @@ -3323,7 +3323,7 @@ MagickExport MagickBooleanType QuantizeImages(const QuantizeInfo *quantize_info, static size_t QuantizeErrorFlatten(const CubeInfo *cube_info, const NodeInfo *node_info,const ssize_t offset,double *quantize_error) { - register ssize_t + ssize_t i; size_t @@ -3369,7 +3369,7 @@ static size_t QuantizeErrorFlatten(const CubeInfo *cube_info, */ static void Reduce(CubeInfo *cube_info,const NodeInfo *node_info) { - register ssize_t + ssize_t i; size_t @@ -3734,7 +3734,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image, PixelInfo *colormap; - register ssize_t + ssize_t i; size_t @@ -3773,10 +3773,10 @@ static MagickBooleanType SetGrayscaleImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -3790,7 +3790,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - register size_t + size_t intensity; intensity=ScaleQuantumToMap(GetPixelRed(image,q)); @@ -3853,10 +3853,10 @@ static MagickBooleanType SetGrayscaleImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) diff --git a/MagickCore/quantum-export.c b/MagickCore/quantum-export.c index 0eee7d99a..85f2d1296 100644 --- a/MagickCore/quantum-export.c +++ b/MagickCore/quantum-export.c @@ -176,7 +176,7 @@ static inline unsigned char *PopFloatPixel(QuantumInfo *quantum_info, static inline unsigned char *PopQuantumPixel(QuantumInfo *quantum_info, const QuantumAny pixel,unsigned char *magick_restrict pixels) { - register ssize_t + ssize_t i; size_t @@ -209,7 +209,7 @@ static inline unsigned char *PopQuantumPixel(QuantumInfo *quantum_info, static inline unsigned char *PopQuantumLongPixel(QuantumInfo *quantum_info, const size_t pixel,unsigned char *magick_restrict pixels) { - register ssize_t + ssize_t i; size_t @@ -245,7 +245,7 @@ static void ExportAlphaQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(exception != (ExceptionInfo *) NULL); @@ -255,7 +255,7 @@ static void ExportAlphaQuantum(const Image *image,QuantumInfo *quantum_info, { case 8: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) number_pixels; x++) @@ -269,7 +269,7 @@ static void ExportAlphaQuantum(const Image *image,QuantumInfo *quantum_info, } case 16: { - register unsigned short + unsigned short pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -294,7 +294,7 @@ static void ExportAlphaQuantum(const Image *image,QuantumInfo *quantum_info, } case 32: { - register unsigned int + unsigned int pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -351,7 +351,7 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; ssize_t @@ -376,7 +376,7 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info, } case 10: { - register unsigned int + unsigned int pixel; range=GetQuantumRange(quantum_info->depth); @@ -425,7 +425,7 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info, } case 12: { - register unsigned int + unsigned int pixel; range=GetQuantumRange(quantum_info->depth); @@ -549,7 +549,7 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info, } case 16: { - register unsigned short + unsigned short pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -582,7 +582,7 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info, } case 32: { - register unsigned int + unsigned int pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -651,7 +651,7 @@ static void ExportBGRAQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(exception != (ExceptionInfo *) NULL); @@ -660,7 +660,7 @@ static void ExportBGRAQuantum(const Image *image,QuantumInfo *quantum_info, { case 8: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) number_pixels; x++) @@ -680,13 +680,13 @@ static void ExportBGRAQuantum(const Image *image,QuantumInfo *quantum_info, } case 10: { - register unsigned int + unsigned int pixel; range=GetQuantumRange(quantum_info->depth); if (quantum_info->pack == MagickFalse) { - register ssize_t + ssize_t i; size_t @@ -775,7 +775,7 @@ static void ExportBGRAQuantum(const Image *image,QuantumInfo *quantum_info, } case 16: { - register unsigned short + unsigned short pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -812,7 +812,7 @@ static void ExportBGRAQuantum(const Image *image,QuantumInfo *quantum_info, } case 32: { - register unsigned int + unsigned int pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -895,7 +895,7 @@ static void ExportBGROQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(exception != (ExceptionInfo *) NULL); @@ -904,7 +904,7 @@ static void ExportBGROQuantum(const Image *image,QuantumInfo *quantum_info, { case 8: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) number_pixels; x++) @@ -924,13 +924,13 @@ static void ExportBGROQuantum(const Image *image,QuantumInfo *quantum_info, } case 10: { - register unsigned int + unsigned int pixel; range=GetQuantumRange(quantum_info->depth); if (quantum_info->pack == MagickFalse) { - register ssize_t + ssize_t i; size_t @@ -1019,7 +1019,7 @@ static void ExportBGROQuantum(const Image *image,QuantumInfo *quantum_info, } case 16: { - register unsigned short + unsigned short pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -1056,7 +1056,7 @@ static void ExportBGROQuantum(const Image *image,QuantumInfo *quantum_info, } case 32: { - register unsigned int + unsigned int pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -1139,7 +1139,7 @@ static void ExportBlackQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; if (image->colorspace != CMYKColorspace) @@ -1152,7 +1152,7 @@ static void ExportBlackQuantum(const Image *image,QuantumInfo *quantum_info, { case 8: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) number_pixels; x++) @@ -1166,7 +1166,7 @@ static void ExportBlackQuantum(const Image *image,QuantumInfo *quantum_info, } case 16: { - register unsigned short + unsigned short pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -1191,7 +1191,7 @@ static void ExportBlackQuantum(const Image *image,QuantumInfo *quantum_info, } case 32: { - register unsigned int + unsigned int pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -1248,7 +1248,7 @@ static void ExportBlueQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(exception != (ExceptionInfo *) NULL); @@ -1257,7 +1257,7 @@ static void ExportBlueQuantum(const Image *image,QuantumInfo *quantum_info, { case 8: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) number_pixels; x++) @@ -1271,7 +1271,7 @@ static void ExportBlueQuantum(const Image *image,QuantumInfo *quantum_info, } case 16: { - register unsigned short + unsigned short pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -1296,7 +1296,7 @@ static void ExportBlueQuantum(const Image *image,QuantumInfo *quantum_info, } case 32: { - register unsigned int + unsigned int pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -1353,11 +1353,11 @@ static void ExportCbYCrYQuantum(const Image *image,QuantumInfo *quantum_info, Quantum cbcr[4]; - register ssize_t + ssize_t i, x; - register unsigned int + unsigned int pixel; size_t @@ -1465,7 +1465,7 @@ static void ExportCMYKQuantum(const Image *image,QuantumInfo *quantum_info, const MagickSizeType number_pixels,const Quantum *magick_restrict p, unsigned char *magick_restrict q,ExceptionInfo *exception) { - register ssize_t + ssize_t x; if (image->colorspace != CMYKColorspace) @@ -1478,7 +1478,7 @@ static void ExportCMYKQuantum(const Image *image,QuantumInfo *quantum_info, { case 8: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) number_pixels; x++) @@ -1498,7 +1498,7 @@ static void ExportCMYKQuantum(const Image *image,QuantumInfo *quantum_info, } case 16: { - register unsigned short + unsigned short pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -1535,7 +1535,7 @@ static void ExportCMYKQuantum(const Image *image,QuantumInfo *quantum_info, } case 32: { - register unsigned int + unsigned int pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -1610,7 +1610,7 @@ static void ExportCMYKAQuantum(const Image *image,QuantumInfo *quantum_info, const MagickSizeType number_pixels,const Quantum *magick_restrict p, unsigned char *magick_restrict q,ExceptionInfo *exception) { - register ssize_t + ssize_t x; if (image->colorspace != CMYKColorspace) @@ -1623,7 +1623,7 @@ static void ExportCMYKAQuantum(const Image *image,QuantumInfo *quantum_info, { case 8: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) number_pixels; x++) @@ -1645,7 +1645,7 @@ static void ExportCMYKAQuantum(const Image *image,QuantumInfo *quantum_info, } case 16: { - register unsigned short + unsigned short pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -1686,7 +1686,7 @@ static void ExportCMYKAQuantum(const Image *image,QuantumInfo *quantum_info, } case 32: { - register unsigned int + unsigned int pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -1775,7 +1775,7 @@ static void ExportCMYKOQuantum(const Image *image,QuantumInfo *quantum_info, const MagickSizeType number_pixels,const Quantum *magick_restrict p, unsigned char *magick_restrict q,ExceptionInfo *exception) { - register ssize_t + ssize_t x; if (image->colorspace != CMYKColorspace) @@ -1788,7 +1788,7 @@ static void ExportCMYKOQuantum(const Image *image,QuantumInfo *quantum_info, { case 8: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) number_pixels; x++) @@ -1810,7 +1810,7 @@ static void ExportCMYKOQuantum(const Image *image,QuantumInfo *quantum_info, } case 16: { - register unsigned short + unsigned short pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -1851,7 +1851,7 @@ static void ExportCMYKOQuantum(const Image *image,QuantumInfo *quantum_info, } case 32: { - register unsigned int + unsigned int pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -1943,7 +1943,7 @@ static void ExportGrayQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(exception != (ExceptionInfo *) NULL); @@ -1952,10 +1952,10 @@ static void ExportGrayQuantum(const Image *image,QuantumInfo *quantum_info, { case 1: { - register double + double threshold; - register unsigned char + unsigned char black, white; @@ -2005,7 +2005,7 @@ static void ExportGrayQuantum(const Image *image,QuantumInfo *quantum_info, } case 4: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) (number_pixels-1) ; x+=2) @@ -2029,7 +2029,7 @@ static void ExportGrayQuantum(const Image *image,QuantumInfo *quantum_info, } case 8: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) number_pixels; x++) @@ -2046,7 +2046,7 @@ static void ExportGrayQuantum(const Image *image,QuantumInfo *quantum_info, range=GetQuantumRange(quantum_info->depth); if (quantum_info->pack == MagickFalse) { - register unsigned int + unsigned int pixel; for (x=0; x < (ssize_t) (number_pixels-2); x+=3) @@ -2084,7 +2084,7 @@ static void ExportGrayQuantum(const Image *image,QuantumInfo *quantum_info, } case 12: { - register unsigned short + unsigned short pixel; range=GetQuantumRange(quantum_info->depth); @@ -2111,7 +2111,7 @@ static void ExportGrayQuantum(const Image *image,QuantumInfo *quantum_info, } case 16: { - register unsigned short + unsigned short pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -2136,7 +2136,7 @@ static void ExportGrayQuantum(const Image *image,QuantumInfo *quantum_info, } case 32: { - register unsigned int + unsigned int pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -2201,7 +2201,7 @@ static void ExportGrayAlphaQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(exception != (ExceptionInfo *) NULL); @@ -2210,10 +2210,10 @@ static void ExportGrayAlphaQuantum(const Image *image,QuantumInfo *quantum_info, { case 1: { - register double + double threshold; - register unsigned char + unsigned char black, pixel, white; @@ -2273,7 +2273,7 @@ static void ExportGrayAlphaQuantum(const Image *image,QuantumInfo *quantum_info, } case 4: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) number_pixels ; x++) @@ -2289,7 +2289,7 @@ static void ExportGrayAlphaQuantum(const Image *image,QuantumInfo *quantum_info, } case 8: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) number_pixels; x++) @@ -2305,7 +2305,7 @@ static void ExportGrayAlphaQuantum(const Image *image,QuantumInfo *quantum_info, } case 16: { - register unsigned short + unsigned short pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -2334,7 +2334,7 @@ static void ExportGrayAlphaQuantum(const Image *image,QuantumInfo *quantum_info, } case 32: { - register unsigned int + unsigned int pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -2407,7 +2407,7 @@ static void ExportGreenQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(exception != (ExceptionInfo *) NULL); @@ -2416,7 +2416,7 @@ static void ExportGreenQuantum(const Image *image,QuantumInfo *quantum_info, { case 8: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) number_pixels; x++) @@ -2430,7 +2430,7 @@ static void ExportGreenQuantum(const Image *image,QuantumInfo *quantum_info, } case 16: { - register unsigned short + unsigned short pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -2455,7 +2455,7 @@ static void ExportGreenQuantum(const Image *image,QuantumInfo *quantum_info, } case 32: { - register unsigned int + unsigned int pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -2509,7 +2509,7 @@ static void ExportIndexQuantum(const Image *image,QuantumInfo *quantum_info, const MagickSizeType number_pixels,const Quantum *magick_restrict p, unsigned char *magick_restrict q,ExceptionInfo *exception) { - register ssize_t + ssize_t x; ssize_t @@ -2525,7 +2525,7 @@ static void ExportIndexQuantum(const Image *image,QuantumInfo *quantum_info, { case 1: { - register unsigned char + unsigned char pixel; for (x=((ssize_t) number_pixels-7); x > 0; x-=8) @@ -2571,7 +2571,7 @@ static void ExportIndexQuantum(const Image *image,QuantumInfo *quantum_info, } case 4: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) (number_pixels-1) ; x+=2) @@ -2677,7 +2677,7 @@ static void ExportIndexAlphaQuantum(const Image *image, const Quantum *magick_restrict p,unsigned char *magick_restrict q, ExceptionInfo *exception) { - register ssize_t + ssize_t x; ssize_t @@ -2693,7 +2693,7 @@ static void ExportIndexAlphaQuantum(const Image *image, { case 1: { - register unsigned char + unsigned char pixel; for (x=((ssize_t) number_pixels-3); x > 0; x-=4) @@ -2742,7 +2742,7 @@ static void ExportIndexAlphaQuantum(const Image *image, } case 4: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) number_pixels ; x++) @@ -2758,7 +2758,7 @@ static void ExportIndexAlphaQuantum(const Image *image, } case 8: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) number_pixels; x++) @@ -2773,7 +2773,7 @@ static void ExportIndexAlphaQuantum(const Image *image, } case 16: { - register unsigned short + unsigned short pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -2802,7 +2802,7 @@ static void ExportIndexAlphaQuantum(const Image *image, } case 32: { - register unsigned int + unsigned int pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -2875,7 +2875,7 @@ static void ExportOpacityQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(exception != (ExceptionInfo *) NULL); @@ -2884,7 +2884,7 @@ static void ExportOpacityQuantum(const Image *image,QuantumInfo *quantum_info, { case 8: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) number_pixels; x++) @@ -2898,7 +2898,7 @@ static void ExportOpacityQuantum(const Image *image,QuantumInfo *quantum_info, } case 16: { - register unsigned short + unsigned short pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -2923,7 +2923,7 @@ static void ExportOpacityQuantum(const Image *image,QuantumInfo *quantum_info, } case 32: { - register unsigned int + unsigned int pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -2980,7 +2980,7 @@ static void ExportRedQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(exception != (ExceptionInfo *) NULL); @@ -2989,7 +2989,7 @@ static void ExportRedQuantum(const Image *image,QuantumInfo *quantum_info, { case 8: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) number_pixels; x++) @@ -3003,7 +3003,7 @@ static void ExportRedQuantum(const Image *image,QuantumInfo *quantum_info, } case 16: { - register unsigned short + unsigned short pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -3028,7 +3028,7 @@ static void ExportRedQuantum(const Image *image,QuantumInfo *quantum_info, } case 32: { - register unsigned int + unsigned int pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -3085,7 +3085,7 @@ static void ExportRGBQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; ssize_t @@ -3109,7 +3109,7 @@ static void ExportRGBQuantum(const Image *image,QuantumInfo *quantum_info, } case 10: { - register unsigned int + unsigned int pixel; range=GetQuantumRange(quantum_info->depth); @@ -3158,7 +3158,7 @@ static void ExportRGBQuantum(const Image *image,QuantumInfo *quantum_info, } case 12: { - register unsigned int + unsigned int pixel; range=GetQuantumRange(quantum_info->depth); @@ -3282,7 +3282,7 @@ static void ExportRGBQuantum(const Image *image,QuantumInfo *quantum_info, } case 16: { - register unsigned short + unsigned short pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -3315,7 +3315,7 @@ static void ExportRGBQuantum(const Image *image,QuantumInfo *quantum_info, } case 32: { - register unsigned int + unsigned int pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -3384,7 +3384,7 @@ static void ExportRGBAQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(exception != (ExceptionInfo *) NULL); @@ -3393,7 +3393,7 @@ static void ExportRGBAQuantum(const Image *image,QuantumInfo *quantum_info, { case 8: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) number_pixels; x++) @@ -3413,13 +3413,13 @@ static void ExportRGBAQuantum(const Image *image,QuantumInfo *quantum_info, } case 10: { - register unsigned int + unsigned int pixel; range=GetQuantumRange(quantum_info->depth); if (quantum_info->pack == MagickFalse) { - register ssize_t + ssize_t i; size_t @@ -3508,7 +3508,7 @@ static void ExportRGBAQuantum(const Image *image,QuantumInfo *quantum_info, } case 16: { - register unsigned short + unsigned short pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -3545,7 +3545,7 @@ static void ExportRGBAQuantum(const Image *image,QuantumInfo *quantum_info, } case 32: { - register unsigned int + unsigned int pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -3628,7 +3628,7 @@ static void ExportRGBOQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(exception != (ExceptionInfo *) NULL); @@ -3637,7 +3637,7 @@ static void ExportRGBOQuantum(const Image *image,QuantumInfo *quantum_info, { case 8: { - register unsigned char + unsigned char pixel; for (x=0; x < (ssize_t) number_pixels; x++) @@ -3657,13 +3657,13 @@ static void ExportRGBOQuantum(const Image *image,QuantumInfo *quantum_info, } case 10: { - register unsigned int + unsigned int pixel; range=GetQuantumRange(quantum_info->depth); if (quantum_info->pack == MagickFalse) { - register ssize_t + ssize_t i; size_t @@ -3752,7 +3752,7 @@ static void ExportRGBOQuantum(const Image *image,QuantumInfo *quantum_info, } case 16: { - register unsigned short + unsigned short pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -3789,7 +3789,7 @@ static void ExportRGBOQuantum(const Image *image,QuantumInfo *quantum_info, } case 32: { - register unsigned int + unsigned int pixel; if (quantum_info->format == FloatingPointQuantumFormat) @@ -3873,13 +3873,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image, MagickSizeType number_pixels; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register unsigned char + unsigned char *magick_restrict q; size_t @@ -3908,7 +3908,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image, double Sa; - register Quantum + Quantum *magick_restrict q; /* @@ -3920,7 +3920,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image, q=GetAuthenticPixelQueue(image); for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; Sa=QuantumScale*GetPixelAlpha(image,q); @@ -3940,7 +3940,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image, Quantum quantum; - register Quantum + Quantum *magick_restrict q; if (image_view != (CacheView *) NULL) @@ -4073,7 +4073,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image, Quantum quantum; - register Quantum + Quantum *magick_restrict q; if (image_view != (CacheView *) NULL) diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c index d30418d36..a1875db1b 100644 --- a/MagickCore/quantum-import.c +++ b/MagickCore/quantum-import.c @@ -242,10 +242,10 @@ static inline const unsigned char *PushQuantumFloat24Pixel( static inline const unsigned char *PushQuantumPixel(QuantumInfo *quantum_info, const unsigned char *magick_restrict pixels,unsigned int *quantum) { - register ssize_t + ssize_t i; - register size_t + size_t quantum_bits; *quantum=(QuantumAny) 0; @@ -272,10 +272,10 @@ static inline const unsigned char *PushQuantumLongPixel( QuantumInfo *quantum_info,const unsigned char *magick_restrict pixels, unsigned int *quantum) { - register ssize_t + ssize_t i; - register size_t + size_t quantum_bits; *quantum=0UL; @@ -305,7 +305,7 @@ static void ImportAlphaQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(image != (Image *) NULL); @@ -442,7 +442,7 @@ static void ImportBGRQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; ssize_t @@ -786,7 +786,7 @@ static void ImportBGRAQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(image != (Image *) NULL); @@ -821,7 +821,7 @@ static void ImportBGRAQuantum(const Image *image,QuantumInfo *quantum_info, pixel=0; if (quantum_info->pack == MagickFalse) { - register ssize_t + ssize_t i; size_t @@ -1049,7 +1049,7 @@ static void ImportBGROQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(image != (Image *) NULL); @@ -1084,7 +1084,7 @@ static void ImportBGROQuantum(const Image *image,QuantumInfo *quantum_info, pixel=0; if (quantum_info->pack == MagickFalse) { - register ssize_t + ssize_t i; size_t @@ -1312,7 +1312,7 @@ static void ImportBlackQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; if (image->colorspace != CMYKColorspace) @@ -1453,7 +1453,7 @@ static void ImportBlueQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(image != (Image *) NULL); @@ -1590,7 +1590,7 @@ static void ImportCbYCrYQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; unsigned int @@ -1608,7 +1608,7 @@ static void ImportCbYCrYQuantum(const Image *image,QuantumInfo *quantum_info, pixel=0; if (quantum_info->pack == MagickFalse) { - register ssize_t + ssize_t i; size_t @@ -1684,7 +1684,7 @@ static void ImportCMYKQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; if (image->colorspace != CMYKColorspace) @@ -1875,7 +1875,7 @@ static void ImportCMYKAQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; if (image->colorspace != CMYKColorspace) @@ -2083,7 +2083,7 @@ static void ImportCMYKOQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; if (image->colorspace != CMYKColorspace) @@ -2291,7 +2291,7 @@ static void ImportGrayQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; ssize_t @@ -2303,7 +2303,7 @@ static void ImportGrayQuantum(const Image *image,QuantumInfo *quantum_info, { case 1: { - register Quantum + Quantum black, white; @@ -2334,7 +2334,7 @@ static void ImportGrayQuantum(const Image *image,QuantumInfo *quantum_info, } case 4: { - register unsigned char + unsigned char pixel; range=GetQuantumRange(quantum_info->depth); @@ -2647,7 +2647,7 @@ static void ImportGrayAlphaQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; ssize_t @@ -2659,7 +2659,7 @@ static void ImportGrayAlphaQuantum(const Image *image,QuantumInfo *quantum_info, { case 1: { - register unsigned char + unsigned char pixel; bit=0; @@ -2690,7 +2690,7 @@ static void ImportGrayAlphaQuantum(const Image *image,QuantumInfo *quantum_info, } case 4: { - register unsigned char + unsigned char pixel; range=GetQuantumRange(quantum_info->depth); @@ -2886,7 +2886,7 @@ static void ImportGreenQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(image != (Image *) NULL); @@ -3023,7 +3023,7 @@ static void ImportIndexQuantum(const Image *image,QuantumInfo *quantum_info, MagickBooleanType range_exception; - register ssize_t + ssize_t x; ssize_t @@ -3040,7 +3040,7 @@ static void ImportIndexQuantum(const Image *image,QuantumInfo *quantum_info, { case 1: { - register unsigned char + unsigned char pixel; for (x=0; x < ((ssize_t) number_pixels-7); x+=8) @@ -3076,7 +3076,7 @@ static void ImportIndexQuantum(const Image *image,QuantumInfo *quantum_info, } case 4: { - register unsigned char + unsigned char pixel; for (x=0; x < ((ssize_t) number_pixels-1); x+=2) @@ -3260,7 +3260,7 @@ static void ImportIndexAlphaQuantum(const Image *image, QuantumAny range; - register ssize_t + ssize_t x; ssize_t @@ -3277,7 +3277,7 @@ static void ImportIndexAlphaQuantum(const Image *image, { case 1: { - register unsigned char + unsigned char pixel; for (x=((ssize_t) number_pixels-3); x > 0; x-=4) @@ -3312,7 +3312,7 @@ static void ImportIndexAlphaQuantum(const Image *image, } case 4: { - register unsigned char + unsigned char pixel; range=GetQuantumRange(quantum_info->depth); @@ -3500,7 +3500,7 @@ static void ImportOpacityQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(image != (Image *) NULL); @@ -3637,7 +3637,7 @@ static void ImportRedQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(image != (Image *) NULL); @@ -3774,7 +3774,7 @@ static void ImportRGBQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; ssize_t @@ -4118,7 +4118,7 @@ static void ImportRGBAQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(image != (Image *) NULL); @@ -4153,7 +4153,7 @@ static void ImportRGBAQuantum(const Image *image,QuantumInfo *quantum_info, pixel=0; if (quantum_info->pack == MagickFalse) { - register ssize_t + ssize_t i; size_t @@ -4381,7 +4381,7 @@ static void ImportRGBOQuantum(const Image *image,QuantumInfo *quantum_info, QuantumAny range; - register ssize_t + ssize_t x; assert(image != (Image *) NULL); @@ -4416,7 +4416,7 @@ static void ImportRGBOQuantum(const Image *image,QuantumInfo *quantum_info, pixel=0; if (quantum_info->pack == MagickFalse) { - register ssize_t + ssize_t i; size_t @@ -4645,13 +4645,13 @@ MagickExport size_t ImportQuantumPixels(const Image *image, MagickSizeType number_pixels; - register const unsigned char + const unsigned char *magick_restrict p; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; size_t @@ -4819,7 +4819,7 @@ MagickExport size_t ImportQuantumPixels(const Image *image, q=GetCacheViewAuthenticPixelQueue(image_view); for (x=0; x < (ssize_t) number_pixels; x++) { - register ssize_t + ssize_t i; Sa=QuantumScale*GetPixelAlpha(image,q); diff --git a/MagickCore/quantum-private.h b/MagickCore/quantum-private.h index 317a65a64..3fef6c870 100644 --- a/MagickCore/quantum-private.h +++ b/MagickCore/quantum-private.h @@ -125,7 +125,7 @@ static inline float HalfToSinglePrecision(const unsigned short half) single_precision; } SinglePrecision; - register unsigned int + unsigned int exponent, significand, sign_bit; @@ -192,7 +192,7 @@ static inline unsigned char *PopCharPixel(const unsigned char pixel, static inline unsigned char *PopLongPixel(const EndianType endian, const unsigned int pixel,unsigned char *magick_restrict pixels) { - register unsigned int + unsigned int quantum; quantum=(unsigned int) pixel; @@ -214,7 +214,7 @@ static inline unsigned char *PopLongPixel(const EndianType endian, static inline unsigned char *PopShortPixel(const EndianType endian, const unsigned short pixel,unsigned char *magick_restrict pixels) { - register unsigned int + unsigned int quantum; quantum=pixel; @@ -241,7 +241,7 @@ static inline const unsigned char *PushLongPixel(const EndianType endian, const unsigned char *magick_restrict pixels, unsigned int *magick_restrict pixel) { - register unsigned int + unsigned int quantum; if (endian == LSBEndian) @@ -265,7 +265,7 @@ static inline const unsigned char *PushShortPixel(const EndianType endian, const unsigned char *magick_restrict pixels, unsigned short *magick_restrict pixel) { - register unsigned int + unsigned int quantum; if (endian == LSBEndian) @@ -710,10 +710,10 @@ static inline unsigned short SinglePrecisionToHalf(const float value) single_precision; } SinglePrecision; - register int + int exponent; - register unsigned int + unsigned int significand, sign_bit; @@ -771,7 +771,7 @@ static inline unsigned short SinglePrecisionToHalf(const float value) float alpha; - register int + int i; /* diff --git a/MagickCore/quantum.c b/MagickCore/quantum.c index 7f88a50e2..515d4a338 100644 --- a/MagickCore/quantum.c +++ b/MagickCore/quantum.c @@ -156,7 +156,7 @@ MagickExport QuantumInfo *AcquireQuantumInfo(const ImageInfo *image_info, static MagickBooleanType AcquireQuantumPixels(QuantumInfo *quantum_info, const size_t extent) { - register ssize_t + ssize_t i; assert(quantum_info != (QuantumInfo *) NULL); @@ -247,7 +247,7 @@ MagickExport QuantumInfo *DestroyQuantumInfo(QuantumInfo *quantum_info) */ static void DestroyQuantumPixels(QuantumInfo *quantum_info) { - register ssize_t + ssize_t i; ssize_t diff --git a/MagickCore/random-private.h b/MagickCore/random-private.h index 3a6cd9905..5e97c56ea 100644 --- a/MagickCore/random-private.h +++ b/MagickCore/random-private.h @@ -39,7 +39,7 @@ extern MagickPrivate void static inline RandomInfo **DestroyRandomInfoThreadSet( RandomInfo **random_info) { - register ssize_t + ssize_t i; assert(random_info != (RandomInfo **) NULL); @@ -51,7 +51,7 @@ static inline RandomInfo **DestroyRandomInfoThreadSet( static inline RandomInfo **AcquireRandomInfoThreadSet(void) { - register ssize_t + ssize_t i; RandomInfo diff --git a/MagickCore/random.c b/MagickCore/random.c index b5921438b..12b6e3f3b 100644 --- a/MagickCore/random.c +++ b/MagickCore/random.c @@ -319,7 +319,7 @@ MagickExport RandomInfo *DestroyRandomInfo(RandomInfo *random_info) #if !defined(MAGICKCORE_WINDOWS_SUPPORT) static ssize_t ReadRandom(int file,unsigned char *source,size_t length) { - register unsigned char + unsigned char *q; ssize_t @@ -498,7 +498,7 @@ static StringInfo *GenerateEntropicChaos(RandomInfo *random_info) */ if (environ != (char **) NULL) { - register ssize_t + ssize_t i; /* @@ -831,7 +831,7 @@ MagickPrivate void RandomComponentTerminus(void) static inline void IncrementRandomNonce(StringInfo *nonce) { - register ssize_t + ssize_t i; unsigned char @@ -850,10 +850,10 @@ static inline void IncrementRandomNonce(StringInfo *nonce) MagickExport void SetRandomKey(RandomInfo *random_info,const size_t length, unsigned char *key) { - register size_t + size_t i; - register unsigned char + unsigned char *p; SignatureInfo diff --git a/MagickCore/registry.c b/MagickCore/registry.c index d306f0aad..d38556748 100644 --- a/MagickCore/registry.c +++ b/MagickCore/registry.c @@ -111,7 +111,7 @@ MagickExport MagickBooleanType DefineImageRegistry(const RegistryType type, key[MagickPathExtent], value[MagickPathExtent]; - register char + char *p; assert(option != (const char *) NULL); @@ -423,7 +423,7 @@ MagickExport void ResetImageRegistryIterator(void) static void *DestroyRegistryNode(void *registry_info) { - register RegistryInfo + RegistryInfo *p; p=(RegistryInfo *) registry_info; diff --git a/MagickCore/resample-private.h b/MagickCore/resample-private.h index c55840b4e..358bc2a1b 100644 --- a/MagickCore/resample-private.h +++ b/MagickCore/resample-private.h @@ -27,7 +27,7 @@ extern "C" { static inline ResampleFilter **DestroyResampleFilterThreadSet( ResampleFilter **filter) { - register ssize_t + ssize_t i; assert(filter != (ResampleFilter **) NULL); @@ -42,7 +42,7 @@ static inline ResampleFilter **AcquireResampleFilterThreadSet( const Image *image,const VirtualPixelMethod method, const MagickBooleanType interpolate,ExceptionInfo *exception) { - register ssize_t + ssize_t i; ResampleFilter diff --git a/MagickCore/resample.c b/MagickCore/resample.c index ac58f6ad8..b709b1d07 100644 --- a/MagickCore/resample.c +++ b/MagickCore/resample.c @@ -208,7 +208,7 @@ struct _ResampleFilter MagickExport ResampleFilter *AcquireResampleFilter(const Image *image, ExceptionInfo *exception) { - register ResampleFilter + ResampleFilter *resample_filter; assert(image != (Image *) NULL); @@ -323,8 +323,8 @@ MagickExport MagickBooleanType ResamplePixelColor( double u1; double U,V,Q,DQ,DDQ; double divisor_c,divisor_m; - register double weight; - register const Quantum *pixels; + double weight; + const Quantum *pixels; assert(resample_filter != (ResampleFilter *) NULL); assert(resample_filter->signature == MagickCoreSignature); @@ -1197,7 +1197,7 @@ MagickExport void ScaleResampleFilter(ResampleFilter *resample_filter, } /* Scale ellipse formula to directly index the Filter Lookup Table */ - { register double scale; + { double scale; #if FILTER_LUT /* scale so that F = WLUT_WIDTH; -- hardcoded */ scale = (double)WLUT_WIDTH/F; @@ -1281,7 +1281,7 @@ MagickExport void SetResampleFilter(ResampleFilter *resample_filter, #if FILTER_LUT /* Fill the LUT with the weights from the selected filter function */ - { register int + { int Q; double r_scale; @@ -1336,7 +1336,7 @@ MagickExport void SetResampleFilter(ResampleFilter *resample_filter, if (IsStringTrue(GetImageArtifact(resample_filter->image, "resample:verbose")) != MagickFalse) { - register int + int Q; double r_scale; diff --git a/MagickCore/resize.c b/MagickCore/resize.c index af73fa738..f883f2ce7 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -384,7 +384,7 @@ static double Lagrange(const double x,const ResizeFilter *resize_filter) double value; - register ssize_t + ssize_t i; ssize_t @@ -770,7 +770,7 @@ MagickPrivate ResizeFilter *AcquireResizeFilter(const Image *image, C, value; - register ResizeFilter + ResizeFilter *resize_filter; /* @@ -1345,7 +1345,7 @@ static double I0(double x) t, y; - register ssize_t + ssize_t i; /* @@ -1369,7 +1369,7 @@ static double J1(double x) p, q; - register ssize_t + ssize_t i; static const double @@ -1415,7 +1415,7 @@ static double P1(double x) p, q; - register ssize_t + ssize_t i; static const double @@ -1455,7 +1455,7 @@ static double Q1(double x) p, q; - register ssize_t + ssize_t i; static const double @@ -1763,10 +1763,10 @@ MagickExport Image *InterpolativeResizeImage(const Image *image, PointInfo offset; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1778,7 +1778,7 @@ MagickExport Image *InterpolativeResizeImage(const Image *image, offset.y=((double) y+0.5)*scale.y-0.5; for (x=0; x < (ssize_t) resize_image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -1896,7 +1896,7 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns, MemoryInfo *pixel_info; - register gfloat + gfloat *q; ssize_t @@ -1927,10 +1927,10 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns, image_view=AcquireVirtualCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1943,7 +1943,7 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -1980,10 +1980,10 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns, (void) lqr_carver_scan_reset(carver); while (lqr_carver_scan_ext(carver,&x_offset,&y_offset,(void **) &packet) != 0) { - register Quantum + Quantum *magick_restrict p; - register ssize_t + ssize_t i; p=QueueCacheViewAuthenticPixels(rescale_view,x_offset,y_offset,1,1, @@ -2063,7 +2063,7 @@ MagickExport Image *LiquidRescaleImage(const Image *image, static inline void CopyPixels(const Quantum *source,const ssize_t source_offset, Quantum *destination,const ssize_t destination_offset,const size_t channels) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) channels; i++) @@ -2077,12 +2077,12 @@ static inline void MixPixels(const Quantum *source,const ssize_t *source_offset, ssize_t sum; - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) channels; i++) { - register ssize_t + ssize_t j; sum=0; @@ -2105,7 +2105,7 @@ static inline void Mix2Pixels(const Quantum *source, static inline int PixelsEqual(const Quantum *source1,ssize_t offset1, const Quantum *source2,ssize_t offset2,const size_t channels) { - register ssize_t + ssize_t i; offset1*=channels; @@ -2434,7 +2434,7 @@ static void Fish2X(const Image *source,const Quantum *pixels,Quantum *result, be, de; - register ssize_t + ssize_t i; ssize_t @@ -2589,7 +2589,7 @@ static void Scale2X(const Image *source,const Quantum *pixels,Quantum *result, if (PixelsEqual(pixels,1,pixels,7,channels) || PixelsEqual(pixels,3,pixels,5,channels)) { - register ssize_t + ssize_t i; for (i=0; i < 4; i++) @@ -2626,7 +2626,7 @@ static void Epbx2X(const Image *source,const Quantum *pixels, ) \ ) - register ssize_t + ssize_t i; for (i=0; i < 4; i++) @@ -2814,7 +2814,7 @@ static inline void Scale3X(const Image *source,const Quantum *pixels, } else { - register ssize_t + ssize_t i; for (i=0; i < 9; i++) @@ -2999,10 +2999,10 @@ MagickExport Image *MagnifyImage(const Image *image,ExceptionInfo *exception) Quantum r[128]; /* to hold result pixels */ - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -3019,13 +3019,13 @@ MagickExport Image *MagnifyImage(const Image *image,ExceptionInfo *exception) */ for (x=0; x < (ssize_t) source_image->columns; x++) { - register const Quantum + const Quantum *magick_restrict p; size_t channels; - register ssize_t + ssize_t i; ssize_t @@ -3227,7 +3227,7 @@ typedef struct _ContributionInfo static ContributionInfo **DestroyContributionThreadSet( ContributionInfo **contribution) { - register ssize_t + ssize_t i; assert(contribution != (ContributionInfo **) NULL); @@ -3241,7 +3241,7 @@ static ContributionInfo **DestroyContributionThreadSet( static ContributionInfo **AcquireContributionThreadSet(const size_t count) { - register ssize_t + ssize_t i; ContributionInfo @@ -3334,16 +3334,16 @@ static MagickBooleanType HorizontalFilter( bisect, density; - register const Quantum + const Quantum *magick_restrict p; - register ContributionInfo + ContributionInfo *magick_restrict contribution; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t y; ssize_t @@ -3369,7 +3369,7 @@ static MagickBooleanType HorizontalFilter( continue; if ((density != 0.0) && (density != 1.0)) { - register ssize_t + ssize_t i; /* @@ -3390,7 +3390,7 @@ static MagickBooleanType HorizontalFilter( } for (y=0; y < (ssize_t) resize_image->rows; y++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -3407,7 +3407,7 @@ static MagickBooleanType HorizontalFilter( resize_traits, traits; - register ssize_t + ssize_t j; ssize_t @@ -3552,16 +3552,16 @@ static MagickBooleanType VerticalFilter( bisect, density; - register const Quantum + const Quantum *magick_restrict p; - register ContributionInfo + ContributionInfo *magick_restrict contribution; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; ssize_t @@ -3587,7 +3587,7 @@ static MagickBooleanType VerticalFilter( continue; if ((density != 0.0) && (density != 1.0)) { - register ssize_t + ssize_t i; /* @@ -3609,7 +3609,7 @@ static MagickBooleanType VerticalFilter( } for (x=0; x < (ssize_t) resize_image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -3626,7 +3626,7 @@ static MagickBooleanType VerticalFilter( resize_traits, traits; - register ssize_t + ssize_t j; ssize_t @@ -3866,7 +3866,7 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns, MagickOffsetType progress; - register ssize_t + ssize_t x1; ssize_t @@ -3942,13 +3942,13 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns, #endif for (y=0; y < (ssize_t) sample_image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; ssize_t @@ -3972,7 +3972,7 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns, */ for (x=0; x < (ssize_t) sample_image->columns; x++) { - register ssize_t + ssize_t i; if (GetPixelWriteMask(sample_image,q) <= (QuantumRange/2)) @@ -4083,7 +4083,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, scale, span; - register ssize_t + ssize_t i; ssize_t @@ -4154,13 +4154,13 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, scale_view=AcquireAuthenticCacheView(scale_image,exception); for (y=0; y < (ssize_t) scale_image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) diff --git a/MagickCore/resource.c b/MagickCore/resource.c index 596d24947..b469ea92d 100644 --- a/MagickCore/resource.c +++ b/MagickCore/resource.c @@ -533,7 +533,7 @@ MagickExport MagickBooleanType GetPathTemplate(char *path) directory=DestroyString(directory); #if defined(MAGICKCORE_WINDOWS_SUPPORT) { - register char + char *p; /* @@ -561,10 +561,10 @@ MagickExport int AcquireUniqueFileResource(char *path) c, file; - register char + char *p; - register ssize_t + ssize_t i; static const char @@ -591,7 +591,7 @@ MagickExport int AcquireUniqueFileResource(char *path) file=(-1); for (i=0; i < (ssize_t) TMP_MAX; i++) { - register ssize_t + ssize_t j; /* @@ -1148,7 +1148,7 @@ MagickPrivate MagickBooleanType ResourceComponentGenesis(void) MagickSizeType memory; - register ssize_t + ssize_t i; ssize_t @@ -1310,7 +1310,7 @@ MagickPrivate MagickBooleanType ResourceComponentGenesis(void) */ MagickPrivate void ResourceComponentTerminus(void) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) NumberOfResourceTypes; i++) diff --git a/MagickCore/segment.c b/MagickCore/segment.c index 0a3f8896c..1380a0f34 100644 --- a/MagickCore/segment.c +++ b/MagickCore/segment.c @@ -288,10 +288,10 @@ static MagickBooleanType Classify(Image *image,short **extrema, MagickStatusType status; - register ssize_t + ssize_t i; - register double + double *squares; size_t @@ -372,10 +372,10 @@ static MagickBooleanType Classify(Image *image,short **extrema, image_view=AcquireVirtualCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); @@ -552,13 +552,13 @@ static MagickBooleanType Classify(Image *image,short **extrema, Cluster *cluster; - register const PixelInfo + const PixelInfo *magick_restrict p; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -603,7 +603,7 @@ static MagickBooleanType Classify(Image *image,short **extrema, ratio, sum; - register ssize_t + ssize_t j, k; @@ -704,7 +704,7 @@ static MagickBooleanType Classify(Image *image,short **extrema, static void ConsolidateCrossings(ZeroCrossing *zero_crossing, const size_t number_crossings) { - register ssize_t + ssize_t i, j, k, @@ -877,7 +877,7 @@ static ssize_t DefineRegion(const short *extrema,ExtentPacket *extents) static void DerivativeHistogram(const double *histogram, double *derivative) { - register ssize_t + ssize_t i, n; @@ -954,10 +954,10 @@ MagickExport MagickBooleanType GetImageDynamicThreshold(const Image *image, double threshold; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; @@ -1223,10 +1223,10 @@ MagickExport MagickBooleanType GetImageDynamicThreshold(const Image *image, static void InitializeHistogram(const Image *image,ssize_t **histogram, ExceptionInfo *exception) { - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; @@ -1298,7 +1298,7 @@ static void InitializeList(IntervalTree **list,ssize_t *number_nodes, static void MeanStability(IntervalTree *node) { - register IntervalTree + IntervalTree *child; if (node == (IntervalTree *) NULL) @@ -1307,10 +1307,10 @@ static void MeanStability(IntervalTree *node) child=node->child; if (child != (IntervalTree *) NULL) { - register ssize_t + ssize_t count; - register double + double sum; sum=0.0; @@ -1347,7 +1347,7 @@ static IntervalTree *InitializeIntervalTree(const ZeroCrossing *zero_crossing, *node, *root; - register ssize_t + ssize_t i; ssize_t @@ -1523,7 +1523,7 @@ static double OptimalTau(const ssize_t *histogram,const double max_tau, MagickBooleanType peak; - register ssize_t + ssize_t i, x; @@ -1722,7 +1722,7 @@ static void ScaleSpace(const ssize_t *histogram,const double tau, *gamma, sum; - register ssize_t + ssize_t u, x; @@ -1802,7 +1802,7 @@ MagickExport MagickBooleanType SegmentImage(Image *image, MagickBooleanType status; - register ssize_t + ssize_t i; short @@ -1895,7 +1895,7 @@ MagickExport MagickBooleanType SegmentImage(Image *image, static void ZeroCrossHistogram(double *second_derivative, const double smooth_threshold,short *crossings) { - register ssize_t + ssize_t i; ssize_t diff --git a/MagickCore/shear.c b/MagickCore/shear.c index b5520b053..4d89f241c 100644 --- a/MagickCore/shear.c +++ b/MagickCore/shear.c @@ -127,7 +127,7 @@ static MagickBooleanType CropToFitImage(Image **image, geometry, page; - register ssize_t + ssize_t i; /* @@ -219,11 +219,11 @@ static void RadonProjection(const Image *image,MatrixInfo *source_matrixs, MatrixInfo *swap; - register MatrixInfo + MatrixInfo *p, *q; - register ssize_t + ssize_t x; size_t @@ -235,7 +235,7 @@ static void RadonProjection(const Image *image,MatrixInfo *source_matrixs, { for (x=0; x < (ssize_t) GetMatrixColumns(p); x+=2*(ssize_t) step) { - register ssize_t + ssize_t i; ssize_t @@ -295,7 +295,7 @@ static void RadonProjection(const Image *image,MatrixInfo *source_matrixs, #endif for (x=0; x < (ssize_t) GetMatrixColumns(p); x++) { - register ssize_t + ssize_t y; size_t @@ -384,10 +384,10 @@ static MagickBooleanType RadonTransform(const Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t i, x; @@ -441,10 +441,10 @@ static MagickBooleanType RadonTransform(const Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t i, x; @@ -522,10 +522,10 @@ static void GetImageBackgroundColor(Image *image,const ssize_t offset, image_view=AcquireVirtualCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if ((y >= offset) && (y < ((ssize_t) image->rows-offset))) @@ -582,7 +582,7 @@ MagickExport Image *DeskewImage(const Image *image,const double threshold, RectangleInfo geometry; - register ssize_t + ssize_t i; size_t @@ -785,7 +785,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, #endif for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height) { - register ssize_t + ssize_t tile_x; if (status == MagickFalse) @@ -796,13 +796,13 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, MagickBooleanType sync; - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t y; size_t @@ -824,10 +824,10 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, } for (y=0; y < (ssize_t) width; y++) { - register const Quantum + const Quantum *magick_restrict tile_pixels; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -843,7 +843,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, tile_pixels=p+((height-1)*width+y)*GetPixelChannels(image); for (x=0; x < (ssize_t) height; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -886,7 +886,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, } case 2: { - register ssize_t + ssize_t y; /* @@ -901,13 +901,13 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, MagickBooleanType sync; - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -923,7 +923,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, q+=GetPixelChannels(rotate_image)*image->columns; for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; q-=GetPixelChannels(rotate_image); @@ -982,7 +982,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, #endif for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height) { - register ssize_t + ssize_t tile_x; if (status == MagickFalse) @@ -993,13 +993,13 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, MagickBooleanType sync; - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t y; size_t @@ -1021,10 +1021,10 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, } for (y=0; y < (ssize_t) width; y++) { - register const Quantum + const Quantum *magick_restrict tile_pixels; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1039,7 +1039,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, tile_pixels=p+((width-1)-y)*GetPixelChannels(image); for (x=0; x < (ssize_t) height; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -1184,11 +1184,11 @@ static MagickBooleanType XShearImage(Image *image,const double degrees, area, displacement; - register Quantum + Quantum *magick_restrict p, *magick_restrict q; - register ssize_t + ssize_t i; ShearDirection @@ -1401,11 +1401,11 @@ static MagickBooleanType YShearImage(Image *image,const double degrees, source, destination; - register Quantum + Quantum *magick_restrict p, *magick_restrict q; - register ssize_t + ssize_t i; ShearDirection diff --git a/MagickCore/signature.c b/MagickCore/signature.c index f0f0e42e0..b180682ba 100644 --- a/MagickCore/signature.c +++ b/MagickCore/signature.c @@ -209,13 +209,13 @@ MagickPrivate SignatureInfo *DestroySignatureInfo(SignatureInfo *signature_info) */ MagickPrivate void FinalizeSignature(SignatureInfo *signature_info) { - register ssize_t + ssize_t i; - register unsigned char + unsigned char *q; - register unsigned int + unsigned int *p; size_t @@ -479,7 +479,7 @@ MagickExport MagickBooleanType SignatureImage(Image *image, float pixel; - register const Quantum + const Quantum *p; SignatureInfo @@ -507,10 +507,10 @@ MagickExport MagickBooleanType SignatureImage(Image *image, image_view=AcquireVirtualCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register unsigned char + unsigned char *q; p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); @@ -522,7 +522,7 @@ MagickExport MagickBooleanType SignatureImage(Image *image, q=pixels; for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; if (GetPixelReadMask(image,p) <= (QuantumRange/2)) @@ -532,7 +532,7 @@ MagickExport MagickBooleanType SignatureImage(Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - register ssize_t + ssize_t j; PixelChannel channel = GetPixelChannelChannel(image,i); @@ -599,10 +599,10 @@ static void TransformSignature(SignatureInfo *signature_info) #define Suma1(x) (RotateRight(x,6) ^ RotateRight(x,11) ^ RotateRight(x,25)) #define Trunc32(x) ((unsigned int) ((x) & 0xffffffffU)) - register ssize_t + ssize_t i; - register unsigned char + unsigned char *p; ssize_t @@ -766,10 +766,10 @@ RestoreMSCWarning MagickPrivate void UpdateSignature(SignatureInfo *signature_info, const StringInfo *message) { - register size_t + size_t i; - register unsigned char + unsigned char *p; size_t diff --git a/MagickCore/splay-tree.c b/MagickCore/splay-tree.c index 862266c4c..5def7be17 100644 --- a/MagickCore/splay-tree.c +++ b/MagickCore/splay-tree.c @@ -157,7 +157,7 @@ MagickExport MagickBooleanType AddValueToSplayTree(SplayTreeInfo *splay_tree, int compare; - register NodeInfo + NodeInfo *node; LockSemaphoreInfo(splay_tree->semaphore); @@ -247,7 +247,7 @@ MagickExport MagickBooleanType AddValueToSplayTree(SplayTreeInfo *splay_tree, static NodeInfo *LinkSplayTreeNodes(NodeInfo **nodes,const size_t low, const size_t high) { - register NodeInfo + NodeInfo *node; size_t @@ -268,7 +268,7 @@ static NodeInfo *LinkSplayTreeNodes(NodeInfo **nodes,const size_t low, static inline int SplayTreeToNodeArray(NodeInfo *node,const void *nodes) { - register const NodeInfo + const NodeInfo ***p; p=(const NodeInfo ***) nodes; @@ -332,7 +332,7 @@ static void BalanceSplayTree(SplayTreeInfo *splay_tree) static inline void *GetFirstSplayTreeNode(SplayTreeInfo *splay_tree) { - register NodeInfo + NodeInfo *node; node=splay_tree->root; @@ -346,7 +346,7 @@ static inline void *GetFirstSplayTreeNode(SplayTreeInfo *splay_tree) MagickExport SplayTreeInfo *CloneSplayTree(SplayTreeInfo *splay_tree, void *(*clone_key)(void *),void *(*clone_value)(void *)) { - register NodeInfo + NodeInfo *next, *node; @@ -486,7 +486,7 @@ MagickExport int CompareSplayTreeStringInfo(const void *target, MagickExport MagickBooleanType DeleteNodeByValueFromSplayTree( SplayTreeInfo *splay_tree,const void *value) { - register NodeInfo + NodeInfo *next, *node; @@ -517,7 +517,7 @@ MagickExport MagickBooleanType DeleteNodeByValueFromSplayTree( int compare; - register NodeInfo + NodeInfo *left, *right; @@ -606,7 +606,7 @@ MagickExport MagickBooleanType DeleteNodeFromSplayTree( int compare; - register NodeInfo + NodeInfo *left, *right; @@ -684,7 +684,7 @@ MagickExport SplayTreeInfo *DestroySplayTree(SplayTreeInfo *splay_tree) NodeInfo *node; - register NodeInfo + NodeInfo *active, *pend; @@ -768,7 +768,7 @@ MagickExport SplayTreeInfo *DestroySplayTree(SplayTreeInfo *splay_tree) */ MagickExport const void *GetNextKeyInSplayTree(SplayTreeInfo *splay_tree) { - register NodeInfo + NodeInfo *node; void @@ -822,7 +822,7 @@ MagickExport const void *GetNextKeyInSplayTree(SplayTreeInfo *splay_tree) */ MagickExport const void *GetNextValueInSplayTree(SplayTreeInfo *splay_tree) { - register NodeInfo + NodeInfo *node; void @@ -1030,10 +1030,10 @@ static int IterateOverSplayTree(SplayTreeInfo *splay_tree, NodeInfo **nodes; - register ssize_t + ssize_t i; - register NodeInfo + NodeInfo *node; TransitionType @@ -1190,7 +1190,7 @@ MagickExport SplayTreeInfo *NewSplayTree( MagickExport void *RemoveNodeByValueFromSplayTree(SplayTreeInfo *splay_tree, const void *value) { - register NodeInfo + NodeInfo *next, *node; @@ -1222,7 +1222,7 @@ MagickExport void *RemoveNodeByValueFromSplayTree(SplayTreeInfo *splay_tree, int compare; - register NodeInfo + NodeInfo *left, *right; @@ -1302,7 +1302,7 @@ MagickExport void *RemoveNodeFromSplayTree(SplayTreeInfo *splay_tree, int compare; - register NodeInfo + NodeInfo *left, *right; @@ -1382,7 +1382,7 @@ MagickExport void ResetSplayTree(SplayTreeInfo *splay_tree) NodeInfo *node; - register NodeInfo + NodeInfo *active, *pend; @@ -1521,7 +1521,7 @@ static NodeInfo *Splay(SplayTreeInfo *splay_tree,const size_t depth, NodeInfo **next; - register NodeInfo + NodeInfo *n, *p; diff --git a/MagickCore/static.c b/MagickCore/static.c index 7f0fe2515..0bf48e9bc 100644 --- a/MagickCore/static.c +++ b/MagickCore/static.c @@ -223,7 +223,7 @@ MagickExport MagickBooleanType RegisterStaticModule(const char *module, PolicyRights rights; - register const CoderInfo + const CoderInfo *p; size_t diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index 2e01690c6..fdbb28cdc 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -140,7 +140,7 @@ typedef struct _PixelChannels static PixelChannels **DestroyPixelThreadSet(const Image *images, PixelChannels **pixels) { - register ssize_t + ssize_t i; size_t @@ -164,7 +164,7 @@ static PixelChannels **AcquirePixelThreadSet(const Image *images) PixelChannels **pixels; - register ssize_t + ssize_t i; size_t @@ -183,7 +183,7 @@ static PixelChannels **AcquirePixelThreadSet(const Image *images) columns=MagickMax(next->columns,columns); for (i=0; i < (ssize_t) rows; i++) { - register ssize_t + ssize_t j; pixels[i]=(PixelChannels *) AcquireQuantumMemory(columns,sizeof(**pixels)); @@ -191,7 +191,7 @@ static PixelChannels **AcquirePixelThreadSet(const Image *images) return(DestroyPixelThreadSet(images,pixels)); for (j=0; j < (ssize_t) columns; j++) { - register ssize_t + ssize_t k; for (k=0; k < MaxPixelChannels; k++) @@ -221,7 +221,7 @@ static int IntensityCompare(const void *x,const void *y) double distance; - register ssize_t + ssize_t i; color_1=(const PixelChannels *) x; @@ -242,7 +242,7 @@ static double ApplyEvaluateOperator(RandomInfo *random_info,const Quantum pixel, double result; - register ssize_t + ssize_t i; result=0.0; @@ -574,13 +574,13 @@ MagickExport Image *EvaluateImages(const Image *images, const Quantum **p; - register PixelChannels + PixelChannels *evaluate_pixel; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; ssize_t @@ -614,7 +614,7 @@ MagickExport Image *EvaluateImages(const Image *images, evaluate_pixel=evaluate_pixels[id]; for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; next=images; @@ -688,14 +688,14 @@ MagickExport Image *EvaluateImages(const Image *images, const Quantum **p; - register ssize_t + ssize_t i, x; - register PixelChannels + PixelChannels *evaluate_pixel; - register Quantum + Quantum *magick_restrict q; ssize_t @@ -735,7 +735,7 @@ MagickExport Image *EvaluateImages(const Image *images, { for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(next); i++) @@ -770,7 +770,7 @@ MagickExport Image *EvaluateImages(const Image *images, { for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - register ssize_t + ssize_t j; for (j=0; j < (ssize_t) (number_images-1); j++) @@ -877,10 +877,10 @@ MagickExport MagickBooleanType EvaluateImage(Image *image, const int id = GetOpenMPThreadId(); - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -896,7 +896,7 @@ MagickExport MagickBooleanType EvaluateImage(Image *image, double result; - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -978,7 +978,7 @@ static Quantum ApplyFunction(Quantum pixel,const MagickFunction function, double result; - register ssize_t + ssize_t i; (void) exception; @@ -1109,10 +1109,10 @@ MagickExport MagickBooleanType FunctionImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1125,7 +1125,7 @@ MagickExport MagickBooleanType FunctionImage(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -1432,7 +1432,7 @@ MagickExport MagickBooleanType GetImageMedian(const Image *image,double *median, static size_t GetImageChannels(const Image *image) { - register ssize_t + ssize_t i; size_t @@ -1508,10 +1508,10 @@ MagickExport ChannelMoments *GetImageMoments(const Image *image, image_view=AcquireVirtualCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; /* @@ -1522,7 +1522,7 @@ MagickExport ChannelMoments *GetImageMoments(const Image *image, break; for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -1553,10 +1553,10 @@ MagickExport ChannelMoments *GetImageMoments(const Image *image, } for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; /* @@ -1567,7 +1567,7 @@ MagickExport ChannelMoments *GetImageMoments(const Image *image, break; for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -1783,10 +1783,10 @@ MagickExport ChannelPerceptualHash *GetImagePerceptualHash(const Image *image, MagickBooleanType status; - register char + char *p; - register ssize_t + ssize_t i; perceptual_hash=(ChannelPerceptualHash *) AcquireQuantumMemory( @@ -1910,10 +1910,10 @@ MagickExport MagickBooleanType GetImageRange(const Image *image,double *minima, MagickBooleanType row_initialize; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1927,7 +1927,7 @@ MagickExport MagickBooleanType GetImageRange(const Image *image,double *minima, row_initialize=MagickTrue; for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -2015,7 +2015,7 @@ static ssize_t GetMedianPixel(Quantum *pixels,const size_t n) { #define SwapPixels(alpha,beta) \ { \ - register Quantum gamma=(alpha); \ + Quantum gamma=(alpha); \ (alpha)=(beta);(beta)=gamma; \ } @@ -2085,7 +2085,7 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image, QuantumAny range; - register ssize_t + ssize_t i; size_t @@ -2124,10 +2124,10 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image, sizeof(*histogram)); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; /* @@ -2138,7 +2138,7 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image, break; for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; if (GetPixelReadMask(image,p) <= (QuantumRange/2)) @@ -2218,7 +2218,7 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image, double number_bins; - register ssize_t + ssize_t j; /* @@ -2290,10 +2290,10 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image, continue; for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -2447,14 +2447,14 @@ MagickExport Image *PolynomialImage(const Image *images, const int id = GetOpenMPThreadId(); - register ssize_t + ssize_t i, x; - register PixelChannels + PixelChannels *polynomial_pixel; - register Quantum + Quantum *magick_restrict q; ssize_t @@ -2476,7 +2476,7 @@ MagickExport Image *PolynomialImage(const Image *images, next=images; for (j=0; j < (ssize_t) number_images; j++) { - register const Quantum + const Quantum *p; if (j >= (ssize_t) number_terms) @@ -2490,7 +2490,7 @@ MagickExport Image *PolynomialImage(const Image *images, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(next); i++) @@ -2519,7 +2519,7 @@ MagickExport Image *PolynomialImage(const Image *images, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -2634,7 +2634,7 @@ static PixelList *DestroyPixelList(PixelList *pixel_list) static PixelList **DestroyPixelListThreadSet(PixelList **pixel_list) { - register ssize_t + ssize_t i; assert(pixel_list != (PixelList **) NULL); @@ -2671,7 +2671,7 @@ static PixelList **AcquirePixelListThreadSet(const size_t width, PixelList **pixel_list; - register ssize_t + ssize_t i; size_t @@ -2694,10 +2694,10 @@ static PixelList **AcquirePixelListThreadSet(const size_t width, static void AddNodePixelList(PixelList *pixel_list,const size_t color) { - register SkipList + SkipList *p; - register ssize_t + ssize_t level; size_t @@ -2753,7 +2753,7 @@ static void AddNodePixelList(PixelList *pixel_list,const size_t color) static inline void GetMedianPixelList(PixelList *pixel_list,Quantum *pixel) { - register SkipList + SkipList *p; size_t @@ -2778,7 +2778,7 @@ static inline void GetMedianPixelList(PixelList *pixel_list,Quantum *pixel) static inline void GetModePixelList(PixelList *pixel_list,Quantum *pixel) { - register SkipList + SkipList *p; size_t @@ -2812,7 +2812,7 @@ static inline void GetModePixelList(PixelList *pixel_list,Quantum *pixel) static inline void GetNonpeakPixelList(PixelList *pixel_list,Quantum *pixel) { - register SkipList + SkipList *p; size_t @@ -2868,10 +2868,10 @@ static void ResetPixelList(PixelList *pixel_list) int level; - register SkipNode + SkipNode *root; - register SkipList + SkipList *p; /* @@ -2953,13 +2953,13 @@ MagickExport Image *StatisticImage(const Image *image,const StatisticType type, const int id = GetOpenMPThreadId(); - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2975,7 +2975,7 @@ MagickExport Image *StatisticImage(const Image *image,const StatisticType type, } for (x=0; x < (ssize_t) statistic_image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -2990,10 +2990,10 @@ MagickExport Image *StatisticImage(const Image *image,const StatisticType type, Quantum pixel; - register const Quantum + const Quantum *magick_restrict pixels; - register ssize_t + ssize_t u; ssize_t diff --git a/MagickCore/stream.c b/MagickCore/stream.c index cd1c88c49..ef2d49ec3 100644 --- a/MagickCore/stream.c +++ b/MagickCore/stream.c @@ -448,10 +448,10 @@ static Quantum *GetAuthenticPixelsFromStream(const Image *image) static MagickBooleanType GetOneAuthenticPixelFromStream(Image *image, const ssize_t x,const ssize_t y,Quantum *pixel,ExceptionInfo *exception) { - register Quantum + Quantum *p; - register ssize_t + ssize_t i; assert(image != (Image *) NULL); @@ -515,7 +515,7 @@ static MagickBooleanType GetOneVirtualPixelFromStream(const Image *image, const Quantum *p; - register ssize_t + ssize_t i; assert(image != (Image *) NULL); @@ -1405,10 +1405,10 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info, QuantumType *quantum_map; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; @@ -1534,7 +1534,7 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info, { case CharPixel: { - register unsigned char + unsigned char *q; q=(unsigned char *) stream_info->pixels; @@ -1698,7 +1698,7 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info, } case DoublePixel: { - register double + double *q; q=(double *) stream_info->pixels; @@ -1890,7 +1890,7 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info, } case FloatPixel: { - register float + float *q; q=(float *) stream_info->pixels; @@ -2082,7 +2082,7 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info, } case LongPixel: { - register unsigned int + unsigned int *q; q=(unsigned int *) stream_info->pixels; @@ -2246,7 +2246,7 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info, } case LongLongPixel: { - register MagickSizeType + MagickSizeType *q; q=(MagickSizeType *) stream_info->pixels; @@ -2412,7 +2412,7 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info, } case QuantumPixel: { - register Quantum + Quantum *q; q=(Quantum *) stream_info->pixels; @@ -2576,7 +2576,7 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info, } case ShortPixel: { - register unsigned short + unsigned short *q; q=(unsigned short *) stream_info->pixels; diff --git a/MagickCore/string-private.h b/MagickCore/string-private.h index b624bb551..450cf2d41 100644 --- a/MagickCore/string-private.h +++ b/MagickCore/string-private.h @@ -57,7 +57,7 @@ static inline const char *StringLocateSubstring(const char *haystack, length_needle, length_haystack; - register size_t + size_t i; if (!haystack || !needle) @@ -66,7 +66,7 @@ static inline const char *StringLocateSubstring(const char *haystack, length_haystack=strlen(haystack)-length_needle+1; for (i=0; i < length_haystack; i++) { - register size_t + size_t j; for (j=0; j < length_needle; j++) diff --git a/MagickCore/string.c b/MagickCore/string.c index 70081f64b..fbde890b6 100644 --- a/MagickCore/string.c +++ b/MagickCore/string.c @@ -392,13 +392,13 @@ MagickExport int CompareStringInfo(const StringInfo *target, MagickExport size_t ConcatenateMagickString(char *magick_restrict destination, const char *magick_restrict source,const size_t length) { - register char + char *magick_restrict q; - register const char + const char *magick_restrict p; - register size_t + size_t i; size_t @@ -603,7 +603,7 @@ MagickExport StringInfo *ConfigureFileToStringInfo(const char *filename) } else { - register size_t + size_t i; ssize_t @@ -719,13 +719,13 @@ MagickExport char *ConstantString(const char *source) MagickExport size_t CopyMagickString(char *magick_restrict destination, const char *magick_restrict source,const size_t length) { - register char + char *magick_restrict q; - register const char + const char *magick_restrict p; - register size_t + size_t n; p=source; @@ -840,7 +840,7 @@ MagickExport StringInfo *DestroyStringInfo(StringInfo *string_info) */ MagickExport char **DestroyStringList(char **list) { - register ssize_t + ssize_t i; assert(list != (char **) NULL); @@ -884,10 +884,10 @@ MagickExport char *EscapeString(const char *source,const char escape) char *destination; - register char + char *q; - register const char + const char *p; size_t @@ -1058,7 +1058,7 @@ MagickExport ssize_t FormatMagickSize(const MagickSizeType size, bytes, extent; - register ssize_t + ssize_t i; ssize_t @@ -1461,10 +1461,10 @@ MagickExport MagickBooleanType IsStringFalse(const char *value) MagickExport void PrintStringInfo(FILE *file,const char *id, const StringInfo *string_info) { - register const char + const char *p; - register size_t + size_t i, j; @@ -1582,7 +1582,7 @@ MagickExport char *SanitizeString(const char *source) const char *q; - register char + char *p; static char @@ -1888,13 +1888,13 @@ MagickExport char *StringInfoToHexString(const StringInfo *string_info) char *string; - register const unsigned char + const unsigned char *p; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *q; size_t @@ -1977,11 +1977,11 @@ MagickExport char **StringToArgv(const char *text,int *argc) char **argv; - register const char + const char *p, *q; - register ssize_t + ssize_t i; *argc=0; @@ -2099,7 +2099,7 @@ MagickExport double *StringToArrayOfDoubles(const char *string,ssize_t *count, double *array; - register ssize_t + ssize_t i; /* @@ -2191,13 +2191,13 @@ MagickExport char *StringToken(const char *delimiters,char **string) char *q; - register char + char *p; - register const char + const char *r; - register int + int c, d; @@ -2285,10 +2285,10 @@ MagickExport char **StringToStrings(const char *text,size_t *count) char **textlist; - register const char + const char *p; - register ssize_t + ssize_t i; size_t @@ -2306,7 +2306,7 @@ MagickExport char **StringToStrings(const char *text,size_t *count) break; if (*p == '\0') { - register const char + const char *q; /* @@ -2342,10 +2342,10 @@ MagickExport char **StringToStrings(const char *text,size_t *count) char hex_string[MagickPathExtent]; - register char + char *q; - register ssize_t + ssize_t j; /* @@ -2465,7 +2465,7 @@ MagickExport StringInfo *StringToStringInfo(const char *string) */ MagickExport void StripString(char *message) { - register char + char *p, *q; @@ -2531,7 +2531,7 @@ MagickExport MagickBooleanType SubstituteString(char **string, MagickBooleanType status; - register char + char *p; size_t diff --git a/MagickCore/thread.c b/MagickCore/thread.c index fd3b29175..9a1210aee 100644 --- a/MagickCore/thread.c +++ b/MagickCore/thread.c @@ -147,7 +147,7 @@ MagickExport MagickBooleanType DeleteMagickThreadKey(MagickThreadKey key) MagickThreadValue *keys; - register ssize_t + ssize_t i; keys=(MagickThreadValue *) key; diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c index 29ba04c87..09d3f4049 100644 --- a/MagickCore/threshold.c +++ b/MagickCore/threshold.c @@ -243,14 +243,14 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image, channel_bias[MaxPixelChannels], channel_sum[MaxPixelChannels]; - register const Quantum + const Quantum *magick_restrict p, *magick_restrict pixels; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t i, x; @@ -404,7 +404,7 @@ static double KapurThreshold(const Image *image,const double *histogram, maximum_entropy, *white_entropy; - register ssize_t + ssize_t i, j; @@ -501,7 +501,7 @@ static double OTSUThreshold(const Image *image,const double *histogram, *sigma, threshold; - register ssize_t + ssize_t i; /* @@ -585,7 +585,7 @@ static double TriangleThreshold(const double *histogram) y1, y2; - register ssize_t + ssize_t i; ssize_t @@ -677,7 +677,7 @@ MagickExport MagickBooleanType AutoThresholdImage(Image *image, MagickBooleanType status; - register ssize_t + ssize_t i; ssize_t @@ -700,10 +700,10 @@ MagickExport MagickBooleanType AutoThresholdImage(Image *image, image_view=AcquireVirtualCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); @@ -841,10 +841,10 @@ MagickExport MagickBooleanType BilevelImage(Image *image,const double threshold, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -860,7 +860,7 @@ MagickExport MagickBooleanType BilevelImage(Image *image,const double threshold, double pixel; - register ssize_t + ssize_t i; pixel=GetPixelIntensity(image,q); @@ -1002,10 +1002,10 @@ MagickExport MagickBooleanType BlackThresholdImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -1021,7 +1021,7 @@ MagickExport MagickBooleanType BlackThresholdImage(Image *image, double pixel; - register ssize_t + ssize_t i; pixel=GetPixelIntensity(image,q); @@ -1108,10 +1108,10 @@ MagickExport MagickBooleanType ClampImage(Image *image,ExceptionInfo *exception) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) { - register ssize_t + ssize_t i; - register PixelInfo + PixelInfo *magick_restrict q; q=image->colormap; @@ -1137,10 +1137,10 @@ MagickExport MagickBooleanType ClampImage(Image *image,ExceptionInfo *exception) #endif for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -1153,7 +1153,7 @@ MagickExport MagickBooleanType ClampImage(Image *image,ExceptionInfo *exception) } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -1325,10 +1325,10 @@ MagickExport MagickBooleanType ColorThresholdImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -1344,7 +1344,7 @@ MagickExport MagickBooleanType ColorThresholdImage(Image *image, MagickBooleanType foreground = MagickTrue; - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -1519,7 +1519,7 @@ static ThresholdMap *GetThresholdMapFile(const char *xml,const char *filename, double value; - register ssize_t + ssize_t i; ThresholdMap @@ -1896,7 +1896,7 @@ MagickExport MagickBooleanType OrderedDitherImage(Image *image, MagickOffsetType progress; - register ssize_t + ssize_t i; ssize_t @@ -1964,10 +1964,10 @@ MagickExport MagickBooleanType OrderedDitherImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -1980,7 +1980,7 @@ MagickExport MagickBooleanType OrderedDitherImage(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; ssize_t @@ -2098,10 +2098,10 @@ MagickExport MagickBooleanType PerceptibleImage(Image *image, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) { - register ssize_t + ssize_t i; - register PixelInfo + PixelInfo *magick_restrict q; q=image->colormap; @@ -2131,10 +2131,10 @@ MagickExport MagickBooleanType PerceptibleImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -2147,7 +2147,7 @@ MagickExport MagickBooleanType PerceptibleImage(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -2265,10 +2265,10 @@ MagickExport MagickBooleanType RandomThresholdImage(Image *image, const int id = GetOpenMPThreadId(); - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2281,7 +2281,7 @@ MagickExport MagickBooleanType RandomThresholdImage(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -2399,10 +2399,10 @@ MagickExport MagickBooleanType RangeThresholdImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -2418,7 +2418,7 @@ MagickExport MagickBooleanType RangeThresholdImage(Image *image, double pixel; - register ssize_t + ssize_t i; pixel=GetPixelIntensity(image,q); @@ -2577,10 +2577,10 @@ MagickExport MagickBooleanType WhiteThresholdImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -2596,7 +2596,7 @@ MagickExport MagickBooleanType WhiteThresholdImage(Image *image, double pixel; - register ssize_t + ssize_t i; pixel=GetPixelIntensity(image,q); diff --git a/MagickCore/token-private.h b/MagickCore/token-private.h index bb5ec2dd3..c71c0d32e 100644 --- a/MagickCore/token-private.h +++ b/MagickCore/token-private.h @@ -57,10 +57,10 @@ static inline unsigned char *ConvertLatin1ToUTF8( int c; - register const unsigned char + const unsigned char *magick_restrict p; - register unsigned char + unsigned char *magick_restrict q; size_t @@ -99,10 +99,10 @@ static inline int GetNextUTFCode(const char *magick_restrict text, int code; - register ssize_t + ssize_t i; - register int + int c, unicode; diff --git a/MagickCore/token.c b/MagickCore/token.c index 990652cc7..f0af65078 100644 --- a/MagickCore/token.c +++ b/MagickCore/token.c @@ -178,13 +178,13 @@ MagickExport magick_hot_spot size_t GetNextToken( double value; - register char + char *magick_restrict q; - register const char + const char *magick_restrict p; - register ssize_t + ssize_t i; assert(start != (const char *) NULL); @@ -202,7 +202,7 @@ MagickExport magick_hot_spot size_t GetNextToken( case '`': case '{': { - register char + char escape; switch (*p) @@ -360,7 +360,7 @@ MagickExport MagickBooleanType GlobExpression( done, match; - register const char + const char *magick_restrict p; /* @@ -511,7 +511,7 @@ MagickExport MagickBooleanType GlobExpression( char *target; - register char + char *p; target=AcquireString(pattern); @@ -602,7 +602,7 @@ MagickPrivate MagickBooleanType IsGlob(const char *path) MagickBooleanType status = MagickFalse; - register const char + const char *p; if (IsPathAccessible(path) != MagickFalse) @@ -797,7 +797,7 @@ MagickPrivate MagickBooleanType IsGlob(const char *path) static ssize_t sindex(int c,const char *string) { - register const char + const char *p; for (p=string; *p != '\0'; p++) @@ -809,7 +809,7 @@ static ssize_t sindex(int c,const char *string) static void StoreToken(TokenInfo *token_info,char *string, size_t max_token_length,int c) { - register ssize_t + ssize_t i; if ((token_info->offset < 0) || @@ -844,7 +844,7 @@ MagickExport int Tokenizer(TokenInfo *token_info,const unsigned flag, int c; - register ssize_t + ssize_t i; *breaker='\0'; diff --git a/MagickCore/transform.c b/MagickCore/transform.c index dc993c99d..2b7c20051 100644 --- a/MagickCore/transform.c +++ b/MagickCore/transform.c @@ -258,13 +258,13 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, #endif for (y=0; y < (ssize_t) extent.y; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -281,7 +281,7 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, { if ((x < extent.x) || (x >= (ssize_t) (extent.x+extent.width))) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -323,13 +323,13 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, #endif for (y=0; y < (ssize_t) (image->rows-(extent.y+extent.height)); y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -347,7 +347,7 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, { if ((x < extent.x) || (x >= (ssize_t) (extent.x+extent.width))) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -424,7 +424,7 @@ MagickExport Image *ConsolidateCMYKImages(const Image *images, *cmyk_image, *cmyk_images; - register ssize_t + ssize_t j; ssize_t @@ -442,7 +442,7 @@ MagickExport Image *ConsolidateCMYKImages(const Image *images, cmyk_images=NewImageList(); for (j=0; j < (ssize_t) GetImageListLength(images); j+=4) { - register ssize_t + ssize_t i; assert(images != (Image *) NULL); @@ -459,13 +459,13 @@ MagickExport Image *ConsolidateCMYKImages(const Image *images, cmyk_view=AcquireAuthenticCacheView(cmyk_image,exception); for (y=0; y < (ssize_t) images->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; p=GetCacheViewVirtualPixels(image_view,0,y,images->columns,1,exception); @@ -677,13 +677,13 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry, #endif for (y=0; y < (ssize_t) crop_image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -699,7 +699,7 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry, } for (x=0; x < (ssize_t) crop_image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -1033,13 +1033,13 @@ MagickExport Image *ExcerptImage(const Image *image, #endif for (y=0; y < (ssize_t) excerpt_image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1055,7 +1055,7 @@ MagickExport Image *ExcerptImage(const Image *image, } for (x=0; x < (ssize_t) excerpt_image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -1232,13 +1232,13 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception) #endif for (y=0; y < (ssize_t) flip_image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1253,7 +1253,7 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception) } for (x=0; x < (ssize_t) flip_image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -1367,13 +1367,13 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception) #endif for (y=0; y < (ssize_t) flop_image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -1389,7 +1389,7 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception) q+=GetPixelChannels(flop_image)*flop_image->columns; for (x=0; x < (ssize_t) flop_image->columns; x++) { - register ssize_t + ssize_t i; q-=GetPixelChannels(flop_image); @@ -1489,13 +1489,13 @@ static MagickBooleanType CopyImageRegion(Image *destination,const Image *source, MagickBooleanType sync; - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; /* @@ -1512,7 +1512,7 @@ static MagickBooleanType CopyImageRegion(Image *destination,const Image *source, } for (x=0; x < (ssize_t) columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(source); i++) @@ -1811,13 +1811,13 @@ MagickExport Image *SpliceImage(const Image *image, #endif for (y=0; y < (ssize_t) splice_geometry.y; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -1833,7 +1833,7 @@ MagickExport Image *SpliceImage(const Image *image, } for (x=0; x < columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -1857,7 +1857,7 @@ MagickExport Image *SpliceImage(const Image *image, q+=GetPixelChannels(splice_image); for ( ; x < (ssize_t) splice_image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -1901,13 +1901,13 @@ MagickExport Image *SpliceImage(const Image *image, for (y=(ssize_t) (splice_geometry.y+splice_geometry.height); y < (ssize_t) splice_image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -1925,7 +1925,7 @@ MagickExport Image *SpliceImage(const Image *image, } for (x=0; x < columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -1949,7 +1949,7 @@ MagickExport Image *SpliceImage(const Image *image, q+=GetPixelChannels(splice_image); for ( ; x < (ssize_t) splice_image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -2164,13 +2164,13 @@ MagickExport Image *TransposeImage(const Image *image,ExceptionInfo *exception) #endif for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2186,7 +2186,7 @@ MagickExport Image *TransposeImage(const Image *image,ExceptionInfo *exception) } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -2305,13 +2305,13 @@ MagickExport Image *TransverseImage(const Image *image,ExceptionInfo *exception) MagickBooleanType sync; - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2327,7 +2327,7 @@ MagickExport Image *TransverseImage(const Image *image,ExceptionInfo *exception) q+=GetPixelChannels(transverse_image)*image->columns; for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; q-=GetPixelChannels(transverse_image); diff --git a/MagickCore/type.c b/MagickCore/type.c index 50f830b3c..cd8985798 100644 --- a/MagickCore/type.c +++ b/MagickCore/type.c @@ -162,7 +162,7 @@ static MagickBooleanType static void *DestroyTypeNode(void *type_info) { - register TypeInfo + TypeInfo *p; p=(TypeInfo *) type_info; @@ -333,10 +333,10 @@ MagickExport const TypeInfo *GetTypeInfoByFamily(const char *family, const TypeInfo *type_info; - register const TypeInfo + const TypeInfo *p; - register ssize_t + ssize_t i; ssize_t @@ -555,10 +555,10 @@ MagickExport const TypeInfo **GetTypeInfoList(const char *pattern, const TypeInfo **fonts; - register const TypeInfo + const TypeInfo *p; - register ssize_t + ssize_t i; /* @@ -629,7 +629,7 @@ extern "C" { static int TypeCompare(const void *x,const void *y) { - register const char + const char **p, **q; @@ -648,10 +648,10 @@ MagickExport char **GetTypeList(const char *pattern,size_t *number_fonts, char **fonts; - register const TypeInfo + const TypeInfo *p; - register ssize_t + ssize_t i; /* @@ -753,7 +753,7 @@ MagickExport MagickBooleanType LoadFontConfigFonts(SplayTreeInfo *type_cache, width, weight; - register ssize_t + ssize_t i; TypeInfo @@ -947,7 +947,7 @@ MagickExport MagickBooleanType ListTypeInfo(FILE *file,ExceptionInfo *exception) const TypeInfo **type_info; - register ssize_t + ssize_t i; size_t diff --git a/MagickCore/utility.c b/MagickCore/utility.c index 01f8571a2..1fa17b6ae 100644 --- a/MagickCore/utility.c +++ b/MagickCore/utility.c @@ -348,11 +348,11 @@ MagickExport unsigned char *Base64Decode(const char *source,size_t *length) int state; - register const char + const char *p, *q; - register size_t + size_t i; unsigned char @@ -504,10 +504,10 @@ MagickExport char *Base64Encode(const unsigned char *blob, char *encode; - register const unsigned char + const unsigned char *p; - register size_t + size_t i; size_t @@ -583,7 +583,7 @@ MagickExport char *Base64Encode(const unsigned char *blob, */ MagickPrivate void ChopPathComponents(char *path,const size_t components) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) components; i++) @@ -652,7 +652,7 @@ MagickPrivate void ExpandFilename(char *path) #endif username[MagickPathExtent]; - register char + char *p; struct passwd @@ -751,7 +751,7 @@ MagickExport MagickBooleanType ExpandFilenames(int *number_arguments, home_directory[MagickPathExtent], **vector; - register ssize_t + ssize_t i, j; @@ -1226,7 +1226,7 @@ MagickExport void GetPathComponent(const char *path,PathType type, char *q; - register char + char *p; size_t @@ -1417,11 +1417,11 @@ MagickPrivate char **GetPathComponents(const char *path, char **components; - register const char + const char *p, *q; - register ssize_t + ssize_t i; if (path == (char *) NULL) @@ -1578,7 +1578,7 @@ extern "C" { static int FileCompare(const void *x,const void *y) { - register const char + const char **p, **q; @@ -1661,7 +1661,7 @@ MagickPrivate char **ListFiles(const char *directory,const char *pattern, } #if defined(vms) { - register char + char *p; p=strchr(entry->d_name,';'); @@ -1839,7 +1839,7 @@ MagickPrivate MagickBooleanType ShredFile(const char *path) MagickSizeType length; - register ssize_t + ssize_t i; size_t @@ -1892,7 +1892,7 @@ MagickPrivate MagickBooleanType ShredFile(const char *path) RandomInfo *random_info; - register MagickOffsetType + MagickOffsetType j; ssize_t diff --git a/MagickCore/version.c b/MagickCore/version.c index 4891797af..17028961a 100644 --- a/MagickCore/version.c +++ b/MagickCore/version.c @@ -498,7 +498,7 @@ MagickExport const char *GetMagickReleaseDate(void) static unsigned int CRC32(const unsigned char *message,const size_t length) { - register ssize_t + ssize_t i; static MagickBooleanType @@ -515,7 +515,7 @@ static unsigned int CRC32(const unsigned char *message,const size_t length) */ if (crc_initial == MagickFalse) { - register unsigned int + unsigned int j; unsigned int @@ -523,7 +523,7 @@ static unsigned int CRC32(const unsigned char *message,const size_t length) for (j=0; j < 256; j++) { - register ssize_t + ssize_t k; alpha=j; @@ -541,7 +541,7 @@ static unsigned int CRC32(const unsigned char *message,const size_t length) MagickExport unsigned int GetMagickSignature(const StringInfo *nonce) { - register unsigned char + unsigned char *p; StringInfo diff --git a/MagickCore/vision.c b/MagickCore/vision.c index 0282af4af..2f8a38d1e 100644 --- a/MagickCore/vision.c +++ b/MagickCore/vision.c @@ -167,7 +167,7 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, RectangleInfo bounding_box; - register ssize_t + ssize_t i; size_t @@ -251,10 +251,10 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, dy=connectivity > 4 ? connect8[n][0] : connect4[n][0]; for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -353,13 +353,13 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, component_view=AcquireAuthenticCacheView(component_image,exception); for (y=0; y < (ssize_t) component_image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -477,7 +477,7 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, artifact=GetImageArtifact(image,"connected-components:keep-colors"); if (artifact != (const char *) NULL) { - register const char + const char *p; /* @@ -493,7 +493,7 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, PixelInfo pixel; - register const char + const char *q; for (q=p; *q != '\0'; q++) @@ -572,7 +572,7 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, artifact=GetImageArtifact(image,"connected-components:remove-colors"); if (artifact != (const char *) NULL) { - register const char + const char *p; /* @@ -586,7 +586,7 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, PixelInfo pixel; - register const char + const char *q; for (q=p; *q != '\0'; q++) @@ -665,10 +665,10 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, bounding_box=object[i].bounding_box; for (y=(-1); y < (ssize_t) bounding_box.height+1; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -685,7 +685,7 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, Quantum pixels[4]; - register ssize_t + ssize_t v; size_t @@ -698,7 +698,7 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, foreground=0; for (v=0; v < 2; v++) { - register ssize_t + ssize_t u; for (u=0; u < 2; u++) @@ -777,10 +777,10 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, bounding_box=object[i].bounding_box; for (y=(-1); y < (ssize_t) bounding_box.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -797,7 +797,7 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, Quantum pixels[4]; - register ssize_t + ssize_t v; size_t @@ -810,7 +810,7 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, foreground=0; for (v=0; v < 2; v++) { - register ssize_t + ssize_t u; for (u=0; u < 2; u++) @@ -903,10 +903,10 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, RectangleInfo bounding_box; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; ssize_t @@ -1005,10 +1005,10 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, RectangleInfo bounding_box; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; ssize_t @@ -1109,10 +1109,10 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, RectangleInfo bounding_box; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; ssize_t @@ -1215,10 +1215,10 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, RectangleInfo bounding_box; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; ssize_t @@ -1312,7 +1312,7 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, object_view=AcquireVirtualCacheView(component_image,exception); for (i=0; i < (ssize_t) component_image->colors; i++) { - register ssize_t + ssize_t j; size_t @@ -1330,10 +1330,10 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, bounding_box=object[i].bounding_box; for (y=0; y < (ssize_t) bounding_box.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1347,7 +1347,7 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, } for (x=0; x < (ssize_t) bounding_box.width; x++) { - register ssize_t + ssize_t n; if (status == MagickFalse) @@ -1356,7 +1356,7 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, if (j == i) for (n=0; n < (ssize_t) (connectivity > 4 ? 4 : 2); n++) { - register const Quantum + const Quantum *p; /* @@ -1390,10 +1390,10 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, object[i].area=0.0; for (y=0; y < (ssize_t) bounding_box.height; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1448,10 +1448,10 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, component_view=AcquireVirtualCacheView(component_image,exception); for (y=0; y < (ssize_t) component_image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -1495,7 +1495,7 @@ MagickExport Image *ConnectedComponentsImage(const Image *image, CCObjectInfoCompare); if (objects == (CCObjectInfo **) NULL) { - register ssize_t + ssize_t j; artifact=GetImageArtifact(image, diff --git a/MagickCore/visual-effects.c b/MagickCore/visual-effects.c index 560beab34..339f0e1ad 100644 --- a/MagickCore/visual-effects.c +++ b/MagickCore/visual-effects.c @@ -206,13 +206,13 @@ MagickExport Image *AddNoiseImage(const Image *image,const NoiseType noise_type, MagickBooleanType sync; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -227,7 +227,7 @@ MagickExport Image *AddNoiseImage(const Image *image,const NoiseType noise_type, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -363,13 +363,13 @@ MagickExport Image *BlueShiftImage(const Image *image,const double factor, Quantum quantum; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -622,10 +622,10 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend, MagickBooleanType sync; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -639,7 +639,7 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend, } for (x=0; x < (ssize_t) colorize_image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(colorize_image); i++) @@ -747,7 +747,7 @@ MagickExport Image *ColorMatrixImage(const Image *image, MagickOffsetType progress; - register ssize_t + ssize_t i; ssize_t @@ -823,13 +823,13 @@ MagickExport Image *ColorMatrixImage(const Image *image, PixelInfo pixel; - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -845,7 +845,7 @@ MagickExport Image *ColorMatrixImage(const Image *image, GetPixelInfo(image,&pixel); for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t v; size_t @@ -1032,13 +1032,13 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount, PointInfo delta; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -1055,7 +1055,7 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount, delta.y=scale.y*(double) (y-center.y); for (x=0; x < (ssize_t) canvas_image->columns; x++) { - register ssize_t + ssize_t i; /* @@ -1170,10 +1170,10 @@ MagickExport Image *MorphImages(const Image *image,const size_t number_frames, MagickOffsetType scene; - register const Image + const Image *next; - register ssize_t + ssize_t n; ssize_t @@ -1268,13 +1268,13 @@ MagickExport Image *MorphImages(const Image *image,const size_t number_frames, MagickBooleanType sync; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -1290,7 +1290,7 @@ MagickExport Image *MorphImages(const Image *image,const size_t number_frames, } for (x=0; x < (ssize_t) morph_images->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(morph_image); i++) @@ -1408,14 +1408,14 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view, MagickStatusType status; - register const Quantum + const Quantum *magick_restrict u, *magick_restrict v; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t i; ssize_t @@ -1916,13 +1916,13 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -2082,10 +2082,10 @@ MagickExport Image *ShadowImage(const Image *image,const double alpha, image_view=AcquireAuthenticCacheView(border_image,exception); for (y=0; y < (ssize_t) border_image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2213,10 +2213,10 @@ MagickExport Image *SketchImage(const Image *image,const double radius, const int id = GetOpenMPThreadId(); - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -2233,7 +2233,7 @@ MagickExport Image *SketchImage(const Image *image,const double radius, double value; - register ssize_t + ssize_t i; value=GetPseudoRandomValue(random_info[id]); @@ -2351,7 +2351,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image, (void) SetImageColorspace(image,sRGBColorspace,exception); if (image->storage_class == PseudoClass) { - register ssize_t + ssize_t i; /* @@ -2380,10 +2380,10 @@ MagickExport MagickBooleanType SolarizeImage(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -2396,7 +2396,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -2483,10 +2483,10 @@ MagickExport Image *SteganoImage(const Image *image,const Image *watermark, PixelInfo pixel; - register Quantum + Quantum *q; - register ssize_t + ssize_t x; size_t @@ -2696,14 +2696,14 @@ MagickExport Image *StereoAnaglyphImage(const Image *left_image, status=MagickTrue; for (y=0; y < (ssize_t) stereo_image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p, *magick_restrict q; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict r; p=GetVirtualPixels(left_image,-x_offset,y-y_offset,image->columns,1, @@ -2864,13 +2864,13 @@ MagickExport Image *SwirlImage(const Image *image,double degrees, PointInfo delta; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -2894,7 +2894,7 @@ MagickExport Image *SwirlImage(const Image *image,double degrees, distance=delta.x*delta.x+delta.y*delta.y; if (distance >= (radius*radius)) { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) GetPixelChannels(canvas_image); i++) @@ -3086,13 +3086,13 @@ MagickExport Image *TintImage(const Image *image,const char *blend, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -3311,7 +3311,7 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude, MagickOffsetType progress; - register ssize_t + ssize_t i; ssize_t @@ -3374,13 +3374,13 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude, #endif for (y=0; y < (ssize_t) wave_image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -3472,7 +3472,7 @@ static inline void HatTransform(const float *magick_restrict pixels, *magick_restrict q, *magick_restrict r; - register ssize_t + ssize_t i; p=pixels; @@ -3574,7 +3574,7 @@ MagickExport Image *WaveletDenoiseImage(const Image *image, noise_view=AcquireAuthenticCacheView(noise_image,exception); for (channel=0; channel < (ssize_t) GetPixelChannels(image); channel++) { - register ssize_t + ssize_t i; size_t @@ -3607,7 +3607,7 @@ MagickExport Image *WaveletDenoiseImage(const Image *image, i=0; for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; ssize_t @@ -3650,11 +3650,11 @@ MagickExport Image *WaveletDenoiseImage(const Image *image, const int id = GetOpenMPThreadId(); - register float + float *magick_restrict p, *magick_restrict q; - register ssize_t + ssize_t x; p=kernel+id*image->columns; @@ -3673,11 +3673,11 @@ MagickExport Image *WaveletDenoiseImage(const Image *image, const int id = GetOpenMPThreadId(); - register float + float *magick_restrict p, *magick_restrict q; - register ssize_t + ssize_t y; p=kernel+id*image->rows; @@ -3718,10 +3718,10 @@ MagickExport Image *WaveletDenoiseImage(const Image *image, MagickBooleanType sync; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; ssize_t diff --git a/MagickCore/vms.c b/MagickCore/vms.c index 06f65a2a7..28e2a9828 100644 --- a/MagickCore/vms.c +++ b/MagickCore/vms.c @@ -171,10 +171,10 @@ struct dirent *readdir(DIR *directory) int status; - register char + char *p; - register int + int i; struct dsc$descriptor_s diff --git a/MagickCore/widget.c b/MagickCore/widget.c index 07077feaa..78069bb6b 100644 --- a/MagickCore/widget.c +++ b/MagickCore/widget.c @@ -512,7 +512,7 @@ static void XDrawMatteText(Display *display,const XWindowInfo *window_info, x, y; - register int + int i; unsigned int @@ -1138,11 +1138,11 @@ static void XEditText(Display *display,XWidgetInfo *text_info, } default: { - register char + char *p, *q; - register int + int i; if (state & ControlState) @@ -1625,7 +1625,7 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, x, y; - register int + int i; static char @@ -2895,7 +2895,7 @@ MagickPrivate int XCommandWidget(Display *display,XWindows *windows, id, y; - register int + int i; static unsigned int @@ -3643,7 +3643,7 @@ MagickPrivate int XDialogWidget(Display *display,XWindows *windows, int x; - register int + int i; static MagickBooleanType @@ -4230,7 +4230,7 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, x, y; - register ssize_t + ssize_t i; static char @@ -4410,7 +4410,7 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, special_info.y=action_info.y; if (anomaly == MagickFalse) { - register char + char *p; special_info.text=(char *) FormatButtonText; @@ -4787,7 +4787,7 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, XDrawMatteText(display,&windows->widget,&reply_info); if (id == list_info.id) { - register char + char *p; p=reply_info.text+strlen(reply_info.text)-1; @@ -5450,7 +5450,7 @@ extern "C" { static int FontCompare(const void *x,const void *y) { - register char + char *p, *q; @@ -5490,7 +5490,7 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, x, y; - register int + int i; static char @@ -6759,7 +6759,7 @@ MagickPrivate void XListBrowserWidget(Display *display,XWindows *windows, int x; - register int + int i; static MagickStatusType @@ -8446,7 +8446,7 @@ MagickPrivate MagickBooleanType XPreferencesWidget(Display *display, x, y; - register int + int i; Status @@ -8966,7 +8966,7 @@ MagickPrivate void XTextViewWidget(Display *display, char primary_selection[MagickPathExtent]; - register int + int i; static MagickStatusType diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c index e655c2053..751dd820e 100644 --- a/MagickCore/xml-tree.c +++ b/MagickCore/xml-tree.c @@ -220,7 +220,7 @@ MagickPrivate XMLTreeInfo *AddPathToXMLTree(XMLTreeInfo *xml_info, subnode[MagickPathExtent], tag[MagickPathExtent]; - register ssize_t + ssize_t i; size_t @@ -304,10 +304,10 @@ MagickPrivate char *CanonicalXMLContent(const char *content, *base64, *canonical_content; - register const unsigned char + const unsigned char *p; - register ssize_t + ssize_t i; size_t @@ -438,7 +438,7 @@ MagickPrivate char *CanonicalXMLContent(const char *content, static char **DestroyXMLTreeAttributes(char **attributes) { - register ssize_t + ssize_t i; /* @@ -497,7 +497,7 @@ static void DestroyXMLTreeRoot(XMLTreeInfo *xml_info) char **attributes; - register ssize_t + ssize_t i; ssize_t @@ -607,7 +607,7 @@ MagickPrivate char *FileToXML(const char *filename,const size_t extent) MagickOffsetType offset; - register size_t + size_t i; size_t @@ -779,7 +779,7 @@ MagickExport XMLTreeInfo *GetNextXMLTreeTag(XMLTreeInfo *xml_info) MagickExport const char *GetXMLTreeAttribute(XMLTreeInfo *xml_info, const char *tag) { - register ssize_t + ssize_t i; ssize_t @@ -848,7 +848,7 @@ MagickExport const char *GetXMLTreeAttribute(XMLTreeInfo *xml_info, MagickPrivate MagickBooleanType GetXMLTreeAttributes( const XMLTreeInfo *xml_info,SplayTreeInfo *attributes) { - register ssize_t + ssize_t i; assert(xml_info != (XMLTreeInfo *) NULL); @@ -1008,7 +1008,7 @@ MagickPrivate XMLTreeInfo *GetXMLTreePath(XMLTreeInfo *xml_info, subnode[MagickPathExtent], tag[MagickPathExtent]; - register ssize_t + ssize_t i; size_t @@ -1079,7 +1079,7 @@ MagickPrivate XMLTreeInfo *GetXMLTreePath(XMLTreeInfo *xml_info, MagickPrivate const char **GetXMLTreeProcessingInstructions( XMLTreeInfo *xml_info,const char *target) { - register ssize_t + ssize_t i; XMLTreeRoot @@ -1298,7 +1298,7 @@ static char *ConvertUTF16ToUTF8(const char *content,size_t *length) c, encoding; - register ssize_t + ssize_t i; size_t @@ -1377,11 +1377,11 @@ static char *ParseEntities(char *xml,char **entities,int state) byte, c; - register char + char *p, *q; - register ssize_t + ssize_t i; size_t @@ -1588,7 +1588,7 @@ static XMLTreeInfo *ParseCloseTag(XMLTreeRoot *root,char *tag, static MagickBooleanType ValidateEntities(char *tag,char *xml, const size_t depth,char **entities) { - register ssize_t + ssize_t i; /* @@ -1620,7 +1620,7 @@ static void ParseProcessingInstructions(XMLTreeRoot *root,char *xml, char *target; - register ssize_t + ssize_t i; ssize_t @@ -1701,7 +1701,7 @@ static MagickBooleanType ParseInternalDoctype(XMLTreeRoot *root,char *xml, *t, *v; - register ssize_t + ssize_t i; ssize_t @@ -1940,7 +1940,7 @@ static const char static inline MagickBooleanType IsSkipTag(const char *tag) { - register ssize_t + ssize_t i; i=0; @@ -1968,10 +1968,10 @@ MagickExport XMLTreeInfo *NewXMLTree(const char *xml,ExceptionInfo *exception) MagickBooleanType status; - register char + char *p; - register ssize_t + ssize_t i; size_t @@ -2492,7 +2492,7 @@ MagickPrivate XMLTreeInfo *PruneTagFromXMLTree(XMLTreeInfo *xml_info) MagickPrivate XMLTreeInfo *SetXMLTreeAttribute(XMLTreeInfo *xml_info, const char *tag,const char *value) { - register ssize_t + ssize_t i; ssize_t @@ -2661,7 +2661,7 @@ static char *XMLTreeTagToXML(XMLTreeInfo *xml_info,char **source,size_t *length, const char *attribute; - register ssize_t + ssize_t i; size_t @@ -2763,11 +2763,11 @@ MagickExport char *XMLTreeInfoToXML(XMLTreeInfo *xml_info) char *xml; - register char + char *p, *q; - register ssize_t + ssize_t i; size_t diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c index f8b60c8b7..a4f64bb5e 100644 --- a/MagickCore/xwindow.c +++ b/MagickCore/xwindow.c @@ -246,7 +246,7 @@ static Window */ MagickExport void DestroyXResources(void) { - register int + int i; unsigned int @@ -569,10 +569,10 @@ MagickPrivate MagickBooleanType XAnnotateImage(Display *display, annotate_view=AcquireAuthenticCacheView(annotate_image,exception); for (y=0; y < (int) annotate_image->rows; y++) { - register int + int x; - register Quantum + Quantum *magick_restrict q; q=GetCacheViewAuthenticPixels(annotate_view,0,(ssize_t) y, @@ -747,11 +747,11 @@ static char **FontToList(char *font) char **fontlist; - register char + char *p, *q; - register int + int i; unsigned int @@ -820,7 +820,7 @@ MagickPrivate XFontStruct *XBestFont(Display *display, char *font_name; - register const char + const char **p; XFontStruct @@ -835,7 +835,7 @@ MagickPrivate XFontStruct *XBestFont(Display *display, char **fontlist; - register int + int i; /* @@ -1040,10 +1040,10 @@ MagickPrivate void XBestPixel(Display *display,const Colormap colormap, double min_distance; - register double + double distance; - register int + int i, j; @@ -1165,7 +1165,7 @@ MagickPrivate XVisualInfo *XBestVisualInfo(Display *display, int visual_mask; - register int + int i; size_t @@ -1962,7 +1962,7 @@ MagickPrivate void XDisplayImageInfo(Display *display, int unique_file; - register ssize_t + ssize_t i; size_t @@ -2139,13 +2139,13 @@ static void XDitherImage(Image *image,XImage *ximage,ExceptionInfo *exception) PixelInfo color; - register char + char *q; - register const Quantum + const Quantum *p; - register int + int i, j, x; @@ -2153,7 +2153,7 @@ static void XDitherImage(Image *image,XImage *ximage,ExceptionInfo *exception) unsigned int scanline_pad; - register size_t + size_t pixel; unsigned char @@ -2468,10 +2468,10 @@ MagickPrivate MagickBooleanType XDrawImage(Display *display, draw_view=AcquireAuthenticCacheView(draw_image,exception); for (y=0; y < (int) draw_image->rows; y++) { - register int + int x; - register Quantum + Quantum *magick_restrict q; q=QueueCacheViewAuthenticPixels(draw_view,0,(ssize_t) y,draw_image->columns, @@ -2594,10 +2594,10 @@ MagickPrivate MagickBooleanType XDrawImage(Display *display, draw_view=AcquireAuthenticCacheView(draw_image,exception); for (y=0; y < (int) draw_image->rows; y++) { - register int + int x; - register Quantum + Quantum *magick_restrict q; q=GetCacheViewAuthenticPixels(draw_view,0,(ssize_t) y,draw_image->columns,1, @@ -3032,7 +3032,7 @@ MagickPrivate void XGetPixelInfo(Display *display, Colormap colormap; - register ssize_t + ssize_t i; Status @@ -3356,7 +3356,7 @@ MagickExport XrmDatabase XGetResourceDatabase(Display *display, int c; - register const char + const char *p; XrmDatabase @@ -4000,7 +4000,7 @@ static Image *XGetWindowImage(Display *display,const Window window, RectangleInfo crop_info; - register int + int i; static ColormapInfo @@ -4158,14 +4158,14 @@ static Image *XGetWindowImage(Display *display,const Window window, MagickBooleanType import; - register int + int j, x; - register Quantum + Quantum *magick_restrict q; - register size_t + size_t pixel; unsigned int @@ -4326,7 +4326,7 @@ static Image *XGetWindowImage(Display *display,const Window window, case DirectClass: default: { - register size_t + size_t color, index; @@ -5859,13 +5859,13 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info, int y; - register const Quantum + const Quantum *p; - register int + int x; - register unsigned char + unsigned char *q; unsigned char @@ -5929,7 +5929,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info, canvas_view=AcquireVirtualCacheView(canvas,exception); if (ximage->format == XYBitmap) { - register unsigned short + unsigned short polarity; unsigned char @@ -5985,7 +5985,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info, { case 2: { - register unsigned int + unsigned int nibble; /* @@ -6037,7 +6037,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info, } case 4: { - register unsigned int + unsigned int nibble; /* @@ -6105,10 +6105,10 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info, } default: { - register int + int k; - register unsigned int + unsigned int bytes_per_pixel; /* @@ -6141,7 +6141,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info, { case 2: { - register unsigned int + unsigned int nibble; /* @@ -6194,7 +6194,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info, } case 4: { - register unsigned int + unsigned int nibble; /* @@ -6352,10 +6352,10 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info, } else { - register int + int k; - register unsigned int + unsigned int bytes_per_pixel; /* @@ -6476,13 +6476,13 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info, int y; - register int + int x; - register const Quantum + const Quantum *p; - register unsigned char + unsigned char *q; unsigned char @@ -6546,7 +6546,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info, canvas_view=AcquireVirtualCacheView(canvas,exception); if (ximage->format == XYBitmap) { - register unsigned short + unsigned short polarity; unsigned char @@ -6602,7 +6602,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info, { case 2: { - register unsigned int + unsigned int nibble; /* @@ -6655,7 +6655,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info, } case 4: { - register unsigned int + unsigned int nibble; /* @@ -6724,10 +6724,10 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info, } default: { - register int + int k; - register unsigned int + unsigned int bytes_per_pixel; unsigned char @@ -6766,7 +6766,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info, { case 2: { - register unsigned int + unsigned int nibble; /* @@ -6819,7 +6819,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info, } case 4: { - register unsigned int + unsigned int nibble; /* @@ -6977,10 +6977,10 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info, } else { - register int + int k; - register unsigned int + unsigned int bytes_per_pixel; unsigned char @@ -7094,13 +7094,13 @@ MagickPrivate void XMakeMagnifyImage(Display *display,XWindows *windows, PixelInfo pixel; - register int + int x; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *p, *q; @@ -7195,14 +7195,14 @@ MagickPrivate void XMakeMagnifyImage(Display *display,XWindows *windows, ((width*windows->magnify.ximage->bits_per_pixel) >> 3)); if (ximage->bits_per_pixel < 8) { - register unsigned char + unsigned char background, byte, foreground, p_bit, q_bit; - register unsigned int + unsigned int plane; XPixelInfo @@ -7391,7 +7391,7 @@ MagickPrivate void XMakeMagnifyImage(Display *display,XWindows *windows, } default: { - register unsigned int + unsigned int bytes_per_pixel, m; @@ -7714,7 +7714,7 @@ MagickPrivate void XMakeStandardColormap(Display *display, Colormap colormap; - register ssize_t + ssize_t i; Status @@ -7756,7 +7756,7 @@ MagickPrivate void XMakeStandardColormap(Display *display, Image *affinity_image; - register Quantum + Quantum *magick_restrict q; /* @@ -7939,7 +7939,7 @@ MagickPrivate void XMakeStandardColormap(Display *display, int y; - register int + int x; unsigned short @@ -7967,10 +7967,10 @@ MagickPrivate void XMakeStandardColormap(Display *display, image_view=AcquireAuthenticCacheView(image,exception); for (y=0; y < (int) image->rows; y++) { - register int + int x; - register const Quantum + const Quantum *magick_restrict p; p=GetCacheViewAuthenticPixels(image_view,0,(ssize_t) y, @@ -8391,7 +8391,7 @@ MagickPrivate void XMakeWindow(Display *display,Window parent,char **argv, int flags; - register char + char *p; /* @@ -8581,7 +8581,7 @@ static const char *GetLocaleMonitorMessage(const char *text) const char *locale_message; - register char + char *p; (void) CopyMagickString(tag,text,MagickPathExtent); @@ -9694,7 +9694,7 @@ MagickPrivate Window XWindowByID(Display *display,const Window root_window, RectangleInfo rectangle_info; - register int + int i; Status @@ -9769,7 +9769,7 @@ MagickPrivate Window XWindowByID(Display *display,const Window root_window, MagickPrivate Window XWindowByName(Display *display,const Window root_window, const char *name) { - register int + int i; Status diff --git a/MagickWand/animate.c b/MagickWand/animate.c index e2f48a48d..3722948ed 100644 --- a/MagickWand/animate.c +++ b/MagickWand/animate.c @@ -264,7 +264,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info, QuantizeInfo *quantize_info; - register ssize_t + ssize_t i; ssize_t diff --git a/MagickWand/compare.c b/MagickWand/compare.c index aa5e87768..87e985d38 100644 --- a/MagickWand/compare.c +++ b/MagickWand/compare.c @@ -265,7 +265,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info, RectangleInfo offset; - register ssize_t + ssize_t i; ssize_t diff --git a/MagickWand/composite.c b/MagickWand/composite.c index 69e71f321..566578d9c 100644 --- a/MagickWand/composite.c +++ b/MagickWand/composite.c @@ -456,7 +456,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info, MagickStatusType status; - register ssize_t + ssize_t i; ssize_t diff --git a/MagickWand/conjure.c b/MagickWand/conjure.c index f189872c4..3f0cbced3 100644 --- a/MagickWand/conjure.c +++ b/MagickWand/conjure.c @@ -151,7 +151,7 @@ WandExport MagickBooleanType ConjureImageCommand(ImageInfo *image_info, MagickStatusType status; - register ssize_t + ssize_t i; ssize_t diff --git a/MagickWand/convert.c b/MagickWand/convert.c index b9340e319..86fbb2ac4 100644 --- a/MagickWand/convert.c +++ b/MagickWand/convert.c @@ -96,7 +96,7 @@ static MagickBooleanType ConcatenateImages(int argc,char **argv, MagickBooleanType status; - register ssize_t + ssize_t i; /* @@ -525,7 +525,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info, MagickStatusType status; - register ssize_t + ssize_t i; ssize_t diff --git a/MagickWand/display.c b/MagickWand/display.c index abeaafa08..5d32395ee 100644 --- a/MagickWand/display.c +++ b/MagickWand/display.c @@ -304,7 +304,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info, QuantizeInfo *quantize_info; - register ssize_t + ssize_t i; size_t diff --git a/MagickWand/drawing-wand.c b/MagickWand/drawing-wand.c index 3638cad78..b88ccfe5b 100644 --- a/MagickWand/drawing-wand.c +++ b/MagickWand/drawing-wand.c @@ -488,7 +488,7 @@ WandExport DrawingWand *CloneDrawingWand(const DrawingWand *wand) DrawingWand *clone_wand; - register ssize_t + ssize_t i; assert(wand != (DrawingWand *) NULL); @@ -1014,10 +1014,10 @@ WandExport MagickBooleanType DrawComposite(DrawingWand *wand, *clone_image, *image; - register char + char *p; - register ssize_t + ssize_t i; size_t @@ -1932,13 +1932,13 @@ WandExport double *DrawGetStrokeDashArray(const DrawingWand *wand, double *dasharray; - register const double + const double *p; - register double + double *q; - register ssize_t + ssize_t i; size_t @@ -2539,7 +2539,7 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) PixelInfo pixel; - register ssize_t + ssize_t i; XMLTreeInfo @@ -5533,13 +5533,13 @@ WandExport MagickBooleanType DrawSetStrokeDashArray(DrawingWand *wand, MagickBooleanType update; - register const double + const double *p; - register double + double *q; - register ssize_t + ssize_t i; size_t @@ -6445,7 +6445,7 @@ WandExport MagickBooleanType DrawSetVectorGraphics(DrawingWand *wand, const char *q; - register ssize_t + ssize_t x; ssize_t diff --git a/MagickWand/identify.c b/MagickWand/identify.c index 79c87fcda..61aac5a40 100644 --- a/MagickWand/identify.c +++ b/MagickWand/identify.c @@ -212,7 +212,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info, MagickStatusType status; - register ssize_t + ssize_t i; size_t diff --git a/MagickWand/import.c b/MagickWand/import.c index b301e5fb8..9ff89e2a3 100644 --- a/MagickWand/import.c +++ b/MagickWand/import.c @@ -258,7 +258,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info, QuantizeInfo *quantize_info; - register ssize_t + ssize_t i; ssize_t diff --git a/MagickWand/magick-cli.c b/MagickWand/magick-cli.c index 793275432..84656c7e9 100644 --- a/MagickWand/magick-cli.c +++ b/MagickWand/magick-cli.c @@ -653,7 +653,7 @@ static MagickBooleanType ConcatenateImages(int argc,char **argv, int c; - register ssize_t + ssize_t i; if (ExpandFilenames(&argc,&argv) == MagickFalse) diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c index fff880a0e..33c66c22a 100644 --- a/MagickWand/magick-image.c +++ b/MagickWand/magick-image.c @@ -5333,7 +5333,7 @@ WandExport PixelWand **MagickGetImageHistogram(MagickWand *wand, PixelWand **pixel_wands; - register ssize_t + ssize_t i; assert(wand != (MagickWand *) NULL); @@ -5658,7 +5658,7 @@ WandExport MagickBooleanType MagickGetImagePage(MagickWand *wand, WandExport MagickBooleanType MagickGetImagePixelColor(MagickWand *wand, const ssize_t x,const ssize_t y,PixelWand *color) { - register const Quantum + const Quantum *p; CacheView @@ -11045,7 +11045,7 @@ WandExport MagickBooleanType MagickSetImagePage(MagickWand *wand, WandExport MagickBooleanType MagickSetImagePixelColor(MagickWand *wand, const ssize_t x,const ssize_t y,const PixelWand *color) { - register Quantum + Quantum *q; CacheView diff --git a/MagickWand/magick-property.c b/MagickWand/magick-property.c index fb0bc3ca2..db65c32fc 100644 --- a/MagickWand/magick-property.c +++ b/MagickWand/magick-property.c @@ -600,7 +600,7 @@ WandExport char **MagickGetImageArtifacts(MagickWand *wand, const char *artifact; - register ssize_t + ssize_t i; size_t @@ -752,7 +752,7 @@ WandExport char **MagickGetImageProfiles(MagickWand *wand,const char *pattern, const char *property; - register ssize_t + ssize_t i; size_t @@ -889,7 +889,7 @@ WandExport char **MagickGetImageProperties(MagickWand *wand, const char *property; - register ssize_t + ssize_t i; size_t @@ -1091,7 +1091,7 @@ WandExport char **MagickGetOptions(MagickWand *wand,const char *pattern, const char *option; - register ssize_t + ssize_t i; size_t @@ -1497,10 +1497,10 @@ WandExport double *MagickGetSamplingFactors(MagickWand *wand, double *sampling_factors; - register const char + const char *p; - register ssize_t + ssize_t i; assert(wand != (MagickWand *) NULL); @@ -2779,7 +2779,7 @@ WandExport MagickBooleanType MagickSetSamplingFactors(MagickWand *wand, char sampling_factor[MagickPathExtent]; - register ssize_t + ssize_t i; assert(wand != (MagickWand *) NULL); diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index 2e2c40529..899b03627 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -142,7 +142,7 @@ WandExport MagickBooleanType MagickCommandGenesis(ImageInfo *image_info, regard_warnings, status; - register ssize_t + ssize_t i; size_t @@ -422,7 +422,7 @@ static MagickBooleanType MonitorProgress(const char *text, const char *locale_message; - register char + char *p; magick_unreferenced(client_data); @@ -475,7 +475,7 @@ static Image *SparseColorOption(const Image *image, MagickBooleanType error; - register size_t + size_t x; size_t @@ -744,7 +744,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, geometry, region_geometry; - register ssize_t + ssize_t i; /* @@ -1314,7 +1314,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, KernelInfo *kernel_info; - register ssize_t + ssize_t j; size_t @@ -1442,7 +1442,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, double *arguments; - register ssize_t + ssize_t x; size_t @@ -1762,7 +1762,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, MagickFunction function; - register ssize_t + ssize_t x; size_t @@ -3933,7 +3933,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info, MagickStatusType status; - register ssize_t + ssize_t i; ssize_t @@ -6734,7 +6734,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info, ssize_t count; - register ssize_t + ssize_t i; /* @@ -7846,7 +7846,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, QuantizeInfo *quantize_info; - register ssize_t + ssize_t i; ssize_t @@ -8751,7 +8751,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, Image *polynomial_image; - register ssize_t + ssize_t x; size_t @@ -9062,7 +9062,7 @@ WandExport MagickBooleanType MogrifyImages(ImageInfo *image_info, size_t n; - register ssize_t + ssize_t i; assert(image_info != (ImageInfo *) NULL); diff --git a/MagickWand/montage.c b/MagickWand/montage.c index fe21c9d36..eea8738e9 100644 --- a/MagickWand/montage.c +++ b/MagickWand/montage.c @@ -297,7 +297,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, MontageInfo *montage_info; - register ssize_t + ssize_t i; ssize_t diff --git a/MagickWand/operation.c b/MagickWand/operation.c index fccc72ee6..469c902a0 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -104,7 +104,7 @@ static MagickBooleanType MonitorProgress(const char *text, const char *locale_message; - register char + char *p; magick_unreferenced(client_data); @@ -201,7 +201,7 @@ static Image *SparseColorOption(const Image *image, MagickBooleanType error; - register size_t + size_t x; size_t @@ -2155,7 +2155,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, KernelInfo *kernel_info; - register ssize_t + ssize_t j; kernel_info=AcquireKernelInfo(arg1,exception); diff --git a/MagickWand/pixel-iterator.c b/MagickWand/pixel-iterator.c index 97b8ad8c7..b233675cc 100644 --- a/MagickWand/pixel-iterator.c +++ b/MagickWand/pixel-iterator.c @@ -488,10 +488,10 @@ WandExport PixelIterator *NewPixelRegionIterator(MagickWand *wand, WandExport PixelWand **PixelGetCurrentIteratorRow(PixelIterator *iterator, size_t *number_wands) { - register const Quantum + const Quantum *pixels; - register ssize_t + ssize_t x; assert(iterator != (PixelIterator *) NULL); @@ -667,10 +667,10 @@ WandExport ssize_t PixelGetIteratorRow(PixelIterator *iterator) WandExport PixelWand **PixelGetNextIteratorRow(PixelIterator *iterator, size_t *number_wands) { - register const Quantum + const Quantum *pixels; - register ssize_t + ssize_t x; assert(iterator != (PixelIterator *) NULL); @@ -726,10 +726,10 @@ WandExport PixelWand **PixelGetNextIteratorRow(PixelIterator *iterator, WandExport PixelWand **PixelGetPreviousIteratorRow(PixelIterator *iterator, size_t *number_wands) { - register const Quantum + const Quantum *pixels; - register ssize_t + ssize_t x; assert(iterator != (PixelIterator *) NULL); @@ -918,10 +918,10 @@ WandExport MagickBooleanType PixelSyncIterator(PixelIterator *iterator) MagickBooleanType status; - register Quantum + Quantum *magick_restrict pixels; - register ssize_t + ssize_t x; assert(iterator != (const PixelIterator *) NULL); diff --git a/MagickWand/pixel-wand.c b/MagickWand/pixel-wand.c index 0d0895221..1f0789f6b 100644 --- a/MagickWand/pixel-wand.c +++ b/MagickWand/pixel-wand.c @@ -195,7 +195,7 @@ WandExport PixelWand *ClonePixelWand(const PixelWand *wand) WandExport PixelWand **ClonePixelWands(const PixelWand **wands, const size_t number_wands) { - register ssize_t + ssize_t i; PixelWand @@ -275,7 +275,7 @@ WandExport PixelWand *DestroyPixelWand(PixelWand *wand) WandExport PixelWand **DestroyPixelWands(PixelWand **wand, const size_t number_wands) { - register ssize_t + ssize_t i; assert(wand != (PixelWand **) NULL); @@ -441,7 +441,7 @@ WandExport PixelWand *NewPixelWand(void) */ WandExport PixelWand **NewPixelWands(const size_t number_wands) { - register ssize_t + ssize_t i; PixelWand diff --git a/MagickWand/stream.c b/MagickWand/stream.c index b3d2450f0..0c5f34994 100644 --- a/MagickWand/stream.c +++ b/MagickWand/stream.c @@ -194,7 +194,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info, MagickStatusType status; - register ssize_t + ssize_t i; ssize_t diff --git a/MagickWand/wand-view.c b/MagickWand/wand-view.c index b113d5230..4f98d7d5b 100644 --- a/MagickWand/wand-view.c +++ b/MagickWand/wand-view.c @@ -120,7 +120,7 @@ WandExport WandView *CloneWandView(const WandView *wand_view) WandView *clone_view; - register ssize_t + ssize_t i; assert(wand_view != (WandView *) NULL); @@ -178,7 +178,7 @@ WandExport WandView *CloneWandView(const WandView *wand_view) static PixelWand ***DestroyPixelsThreadSet(PixelWand ***pixel_wands, const size_t number_wands) { - register ssize_t + ssize_t i; assert(pixel_wands != (PixelWand ***) NULL); @@ -302,14 +302,14 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source, MagickBooleanType sync; - register const Quantum + const Quantum *magick_restrict duplex_pixels, *magick_restrict pixels; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict destination_pixels; if (status == MagickFalse) @@ -553,10 +553,10 @@ WandExport MagickBooleanType GetWandViewIterator(WandView *source, const int id = GetOpenMPThreadId(); - register const Quantum + const Quantum *pixels; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -721,7 +721,7 @@ static PixelWand ***AcquirePixelsThreadSet(const size_t number_wands) PixelWand ***pixel_wands; - register ssize_t + ssize_t i; size_t @@ -960,10 +960,10 @@ WandExport MagickBooleanType SetWandViewIterator(WandView *destination, MagickBooleanType sync; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict pixels; if (status == MagickFalse) @@ -1098,13 +1098,13 @@ WandExport MagickBooleanType TransferWandViewIterator(WandView *source, MagickBooleanType sync; - register const Quantum + const Quantum *magick_restrict pixels; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict destination_pixels; if (status == MagickFalse) @@ -1253,10 +1253,10 @@ WandExport MagickBooleanType UpdateWandViewIterator(WandView *source, MagickBooleanType sync; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict pixels; if (status == MagickFalse) diff --git a/coders/aai.c b/coders/aai.c index 3e684fe02..280e581e1 100644 --- a/coders/aai.c +++ b/coders/aai.c @@ -101,13 +101,13 @@ static Image *ReadAAIImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; - register unsigned char + unsigned char *p; size_t @@ -334,13 +334,13 @@ static MagickBooleanType WriteAAIImage(const ImageInfo *image_info,Image *image, MagickOffsetType scene; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register unsigned char + unsigned char *magick_restrict q; size_t diff --git a/coders/art.c b/coders/art.c index 1872dc728..5e49def23 100644 --- a/coders/art.c +++ b/coders/art.c @@ -163,7 +163,7 @@ static Image *ReadARTImage(const ImageInfo *image_info,ExceptionInfo *exception) const void *stream; - register Quantum + Quantum *magick_restrict q; q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); @@ -289,7 +289,7 @@ static MagickBooleanType WriteARTImage(const ImageInfo *image_info,Image *image, QuantumInfo *quantum_info; - register const Quantum + const Quantum *p; size_t diff --git a/coders/ashlar.c b/coders/ashlar.c index eb562a964..776cd330d 100644 --- a/coders/ashlar.c +++ b/coders/ashlar.c @@ -448,7 +448,7 @@ static MagickBooleanType PackAshlarTiles(AshlarInfo *ashlar_info, MagickBooleanType status; - register ssize_t + ssize_t i; /* @@ -580,7 +580,7 @@ static MagickBooleanType WriteASHLARImage(const ImageInfo *image_info, value=GetImageOption(image_info,"ashlar:best-fit"); for (i=20; i > 0; i--) { - register ssize_t + ssize_t j; n=0; diff --git a/coders/avs.c b/coders/avs.c index 38344195d..de8899d73 100644 --- a/coders/avs.c +++ b/coders/avs.c @@ -103,13 +103,13 @@ static Image *ReadAVSImage(const ImageInfo *image_info,ExceptionInfo *exception) MemoryInfo *pixel_info; - register Quantum + Quantum *q; - register ssize_t + ssize_t x; - register unsigned char + unsigned char *p; size_t @@ -336,13 +336,13 @@ static MagickBooleanType WriteAVSImage(const ImageInfo *image_info,Image *image, MemoryInfo *pixel_info; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register unsigned char + unsigned char *magick_restrict q; size_t diff --git a/coders/bgr.c b/coders/bgr.c index 89874731c..81b5825cd 100644 --- a/coders/bgr.c +++ b/coders/bgr.c @@ -118,7 +118,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,ExceptionInfo *exception) QuantumType quantum_type; - register ssize_t + ssize_t i; size_t @@ -231,13 +231,13 @@ static Image *ReadBGRImage(const ImageInfo *image_info,ExceptionInfo *exception) } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -311,13 +311,13 @@ static Image *ReadBGRImage(const ImageInfo *image_info,ExceptionInfo *exception) } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -410,13 +410,13 @@ static Image *ReadBGRImage(const ImageInfo *image_info,ExceptionInfo *exception) } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -463,13 +463,13 @@ static Image *ReadBGRImage(const ImageInfo *image_info,ExceptionInfo *exception) } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -516,13 +516,13 @@ static Image *ReadBGRImage(const ImageInfo *image_info,ExceptionInfo *exception) } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -577,13 +577,13 @@ static Image *ReadBGRImage(const ImageInfo *image_info,ExceptionInfo *exception) { for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -669,13 +669,13 @@ static Image *ReadBGRImage(const ImageInfo *image_info,ExceptionInfo *exception) stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -740,13 +740,13 @@ static Image *ReadBGRImage(const ImageInfo *image_info,ExceptionInfo *exception) stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -811,13 +811,13 @@ static Image *ReadBGRImage(const ImageInfo *image_info,ExceptionInfo *exception) stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -884,13 +884,13 @@ static Image *ReadBGRImage(const ImageInfo *image_info,ExceptionInfo *exception) stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -1165,7 +1165,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, */ for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1193,7 +1193,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, */ for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1239,7 +1239,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, */ for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1259,7 +1259,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, } for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1279,7 +1279,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, } for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1301,7 +1301,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, { for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1343,7 +1343,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, return(status); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1369,7 +1369,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, return(status); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1395,7 +1395,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, return(status); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1424,7 +1424,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, return(status); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); diff --git a/coders/bmp.c b/coders/bmp.c index e2c6e8724..a4d0adc84 100644 --- a/coders/bmp.c +++ b/coders/bmp.c @@ -206,11 +206,11 @@ static MagickBooleanType DecodeImage(Image *image,const size_t compression, byte, count; - register ssize_t + ssize_t i, x; - register unsigned char + unsigned char *p, *q; @@ -383,14 +383,14 @@ static size_t EncodeImage(Image *image,const size_t bytes_per_line, MagickBooleanType status; - register const unsigned char + const unsigned char *p; - register ssize_t + ssize_t i, x; - register unsigned char + unsigned char *q; ssize_t @@ -533,14 +533,14 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) Quantum index; - register Quantum + Quantum *q; - register ssize_t + ssize_t i, x; - register unsigned char + unsigned char *p; size_t @@ -1060,7 +1060,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) memset(&quantum_bits,0,sizeof(quantum_bits)); if ((bmp_info.bits_per_pixel == 16) || (bmp_info.bits_per_pixel == 32)) { - register unsigned int + unsigned int sample; /* @@ -1664,14 +1664,14 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image, MemoryInfo *pixel_info; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; - register unsigned char + unsigned char *q; size_t diff --git a/coders/braille.c b/coders/braille.c index 8e2e0495d..e15b6417a 100644 --- a/coders/braille.c +++ b/coders/braille.c @@ -201,10 +201,10 @@ static MagickBooleanType WriteBRAILLEImage(const ImageInfo *image_info, Quantum polarity; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; size_t diff --git a/coders/cals.c b/coders/cals.c index 9c677d1c6..f7d034cac 100644 --- a/coders/cals.c +++ b/coders/cals.c @@ -164,7 +164,7 @@ static Image *ReadCALSImage(const ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t i; unsigned long @@ -397,10 +397,10 @@ static ssize_t WriteCALSRecord(Image *image,const char *data) char pad[128]; - register const char + const char *p; - register ssize_t + ssize_t i; ssize_t @@ -438,7 +438,7 @@ static MagickBooleanType WriteCALSImage(const ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t i; size_t diff --git a/coders/caption.c b/coders/caption.c index 44f3b7a4a..6763a4b41 100644 --- a/coders/caption.c +++ b/coders/caption.c @@ -113,7 +113,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info, split, status; - register ssize_t + ssize_t i; size_t diff --git a/coders/cin.c b/coders/cin.c index ec466dd00..02d238175 100644 --- a/coders/cin.c +++ b/coders/cin.c @@ -403,10 +403,10 @@ static Image *ReadCINImage(const ImageInfo *image_info,ExceptionInfo *exception) QuantumType quantum_type; - register ssize_t + ssize_t i; - register Quantum + Quantum *q; size_t @@ -921,10 +921,10 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image, QuantumType quantum_type; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i; size_t diff --git a/coders/cip.c b/coders/cip.c index 2050c75e7..eb805f9cb 100644 --- a/coders/cip.c +++ b/coders/cip.c @@ -169,10 +169,10 @@ static MagickBooleanType WriteCIPImage(const ImageInfo *image_info,Image *image, MagickBooleanType status; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; diff --git a/coders/clipboard.c b/coders/clipboard.c index e423669af..de5321c43 100644 --- a/coders/clipboard.c +++ b/coders/clipboard.c @@ -125,10 +125,10 @@ static Image *ReadCLIPBOARDImage(const ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; size_t diff --git a/coders/cmyk.c b/coders/cmyk.c index 964145656..d87420349 100644 --- a/coders/cmyk.c +++ b/coders/cmyk.c @@ -118,7 +118,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, QuantumType quantum_type; - register ssize_t + ssize_t i; size_t @@ -230,13 +230,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -313,13 +313,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, { for (i=0; i < (ssize_t) (image->alpha_trait != UndefinedPixelTrait ? 5 : 4); i++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -409,13 +409,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -461,13 +461,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -513,13 +513,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -565,13 +565,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -619,13 +619,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, { for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -710,13 +710,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -780,13 +780,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -850,13 +850,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -921,13 +921,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -994,13 +994,13 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -1263,7 +1263,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, */ for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1291,7 +1291,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, */ for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1342,7 +1342,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, */ for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1362,7 +1362,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, } for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1382,7 +1382,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, } for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1402,7 +1402,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, } for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1424,7 +1424,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, { for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1466,7 +1466,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, return(status); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1492,7 +1492,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, return(status); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1518,7 +1518,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, return(status); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1544,7 +1544,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, return(status); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1572,7 +1572,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, return(status); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); diff --git a/coders/cube.c b/coders/cube.c index 198a65f40..3d909fdee 100644 --- a/coders/cube.c +++ b/coders/cube.c @@ -124,7 +124,7 @@ static Image *ReadCUBEImage(const ImageInfo *image_info, MemoryInfo *cube_info; - register char + char *p; size_t @@ -240,17 +240,17 @@ static Image *ReadCUBEImage(const ImageInfo *image_info, } for (b=0; b < (ssize_t) (hald_level*hald_level); b++) { - register ssize_t + ssize_t g; if (status == MagickFalse) continue; for (g=0; g < (ssize_t) (hald_level*hald_level); g++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t r; if (status == MagickFalse) diff --git a/coders/cut.c b/coders/cut.c index c4f2768cb..06f4b2ae2 100644 --- a/coders/cut.c +++ b/coders/cut.c @@ -104,7 +104,7 @@ static MagickBooleanType InsertRow(Image *image,ssize_t bpp,unsigned char *p, Quantum index; - register Quantum + Quantum *q; ssize_t @@ -265,7 +265,7 @@ static int GetCutColors(Image *image,ExceptionInfo *exception) intensity, scale_intensity; - register Quantum + Quantum *q; ssize_t @@ -347,7 +347,7 @@ static Image *ReadCUTImage(const ImageInfo *image_info,ExceptionInfo *exception) ssize_t i,j; ssize_t ldblk; unsigned char *BImgBuff=NULL,*ptrB; - register Quantum *q; + Quantum *q; /* Open image file. @@ -618,7 +618,7 @@ static Image *ReadCUTImage(const ImageInfo *image_info,ExceptionInfo *exception) { for (i=0; i < (ssize_t)image->colors; i++) { - register Quantum + Quantum sample; sample=ScaleCharToQuantum((unsigned char) i); if(image->colormap[i].red!=sample) goto Finish; diff --git a/coders/dcm.c b/coders/dcm.c index 447f289ca..2877f814a 100644 --- a/coders/dcm.c +++ b/coders/dcm.c @@ -2841,11 +2841,11 @@ static MagickBooleanType ReadDCMPixels(Image *image,DCMInfo *info, PixelPacket pixel; - register ssize_t + ssize_t i, x; - register Quantum + Quantum *q; ssize_t @@ -3060,10 +3060,10 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickOffsetType offset; - register unsigned char + unsigned char *p; - register ssize_t + ssize_t i; size_t @@ -4157,10 +4157,10 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) } if ((info.samples_per_pixel > 1) && (image->interlace == PlaneInterlace)) { - register ssize_t + ssize_t x; - register Quantum + Quantum *q; ssize_t diff --git a/coders/dds.c b/coders/dds.c index 7db07b945..fb7f131b0 100644 --- a/coders/dds.c +++ b/coders/dds.c @@ -1008,7 +1008,7 @@ static MagickBooleanType ReadDDSInfo(Image *image, DDSInfo *dds_info) static MagickBooleanType SetDXT1Pixels(Image *image,ssize_t x,ssize_t y, DDSColors colors,size_t bits,Quantum *q) { - register ssize_t + ssize_t i; ssize_t @@ -1059,7 +1059,7 @@ static MagickBooleanType ReadMipmaps(const ImageInfo *image_info,Image *image, && (dds_info->ddscaps1 & DDSCAPS_TEXTURE || dds_info->ddscaps2 & DDSCAPS2_CUBEMAP)) { - register ssize_t + ssize_t i; size_t @@ -1135,10 +1135,10 @@ static MagickBooleanType ReadDXT1Pixels(Image *image, DDSColors colors; - register Quantum + Quantum *q; - register ssize_t + ssize_t x; size_t @@ -1213,7 +1213,7 @@ static MagickBooleanType SkipDXTMipmaps(Image *image,DDSInfo *dds_info, MagickOffsetType offset; - register ssize_t + ssize_t i; size_t @@ -1259,10 +1259,10 @@ static MagickBooleanType ReadDXT3Pixels(Image *image, DDSColors colors; - register Quantum + Quantum *q; - register ssize_t + ssize_t i, x; @@ -1363,10 +1363,10 @@ static MagickBooleanType ReadDXT5Pixels(Image *image, MagickSizeType alpha_bits; - register Quantum + Quantum *q; - register ssize_t + ssize_t i, x; @@ -1472,7 +1472,7 @@ static MagickBooleanType ReadDXT5(const ImageInfo *image_info,Image *image, static MagickBooleanType ReadUncompressedRGBPixels(Image *image, DDSInfo *dds_info,ExceptionInfo *exception) { - register Quantum + Quantum *q; ssize_t @@ -1545,7 +1545,7 @@ static MagickBooleanType SkipRGBMipmaps(Image *image,DDSInfo *dds_info, MagickOffsetType offset; - register ssize_t + ssize_t i; size_t @@ -1596,7 +1596,7 @@ static MagickBooleanType ReadUncompressedRGB(const ImageInfo *image_info, static MagickBooleanType ReadUncompressedRGBAPixels(Image *image, DDSInfo *dds_info,ExceptionInfo *exception) { - register Quantum + Quantum *q; ssize_t @@ -1955,7 +1955,7 @@ ModuleExport size_t RegisterDDSImage(void) static void RemapIndices(const ssize_t *map, const unsigned char *source, unsigned char *target) { - register ssize_t + ssize_t i; for (i = 0; i < 16; i++) @@ -2024,7 +2024,7 @@ static size_t CompressAlpha(const size_t min, const size_t max, unsigned char codes[8]; - register ssize_t + ssize_t i; size_t @@ -2084,7 +2084,7 @@ static MagickBooleanType ConstructOrdering(const size_t count, dps[16], f; - register ssize_t + ssize_t i; size_t @@ -2413,7 +2413,7 @@ static void CompressRangeFit(const size_t count, half, dist; - register ssize_t + ssize_t i; size_t @@ -2502,7 +2502,7 @@ static void ComputeEndPoints(const DDSSingleColorLookup *lookup[], const unsigned char *color, DDSVector3 *start, DDSVector3 *end, unsigned char *index) { - register ssize_t + ssize_t i; size_t @@ -2548,7 +2548,7 @@ static void ComputePrincipleComponent(const float *covariance, row2, v; - register ssize_t + ssize_t i; row0.x = covariance[0]; @@ -2661,7 +2661,7 @@ static void ComputeWeightedCovariance(const size_t count, static void WriteAlphas(Image *image, const ssize_t *alphas, size_t min5, size_t max5, size_t min7, size_t max7) { - register ssize_t + ssize_t i; size_t @@ -2724,7 +2724,7 @@ static void WriteAlphas(Image *image, const ssize_t *alphas, size_t min5, static void WriteIndices(Image *image, const DDSVector3 start, const DDSVector3 end, unsigned char *indices) { - register ssize_t + ssize_t i; size_t @@ -2805,7 +2805,7 @@ static void WriteSingleColorFit(Image *image, const DDSVector4 *points, start, end; - register ssize_t + ssize_t i; unsigned char @@ -2831,7 +2831,7 @@ static void WriteFourCC(Image *image, const size_t compression, const MagickBooleanType clusterFit, const MagickBooleanType weightByAlpha, ExceptionInfo *exception) { - register ssize_t + ssize_t x; ssize_t @@ -2840,7 +2840,7 @@ static void WriteFourCC(Image *image, const size_t compression, bx, by; - register const Quantum + const Quantum *p; for (y=0; y < (ssize_t) image->rows; y+=4) @@ -2958,10 +2958,10 @@ static void WriteFourCC(Image *image, const size_t compression, static void WriteUncompressed(Image *image, ExceptionInfo *exception) { - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; ssize_t @@ -3011,7 +3011,7 @@ static MagickBooleanType WriteMipmaps(Image *image,const ImageInfo *image_info, fast_mipmaps, status; - register ssize_t + ssize_t i; size_t @@ -3081,7 +3081,7 @@ static void WriteDDSInfo(Image *image, const size_t pixelFormat, char software[MagickPathExtent]; - register ssize_t + ssize_t i; unsigned int diff --git a/coders/debug.c b/coders/debug.c index b8ed09438..32cfa9fab 100644 --- a/coders/debug.c +++ b/coders/debug.c @@ -181,10 +181,10 @@ static MagickBooleanType WriteDEBUGImage(const ImageInfo *image_info, PixelInfo pixel; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; size_t diff --git a/coders/dib.c b/coders/dib.c index 1992abb61..77f4d6fb9 100644 --- a/coders/dib.c +++ b/coders/dib.c @@ -170,11 +170,11 @@ static MagickBooleanType DecodeImage(Image *image, ssize_t y; - register ssize_t + ssize_t i, x; - register unsigned char + unsigned char *p, *q; @@ -344,14 +344,14 @@ static size_t EncodeImage(Image *image,const size_t bytes_per_line, ssize_t y; - register const unsigned char + const unsigned char *p; - register ssize_t + ssize_t i, x; - register unsigned char + unsigned char *q; /* @@ -473,16 +473,16 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception) Quantum index; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *p; size_t @@ -1097,14 +1097,14 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image, MagickBooleanType status; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; - register unsigned char + unsigned char *q; size_t @@ -1198,7 +1198,7 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image, { case 1: { - register unsigned char + unsigned char bit, byte; diff --git a/coders/djvu.c b/coders/djvu.c index 881515c22..cdb96725b 100644 --- a/coders/djvu.c +++ b/coders/djvu.c @@ -428,7 +428,7 @@ get_page_image(LoadContext *lc, ddjvu_page_t *page, int x, int y, int w, int h, /* old: */ char* r; #else - register Quantum *r; + Quantum *r; unsigned char *s; #endif s=q; @@ -575,7 +575,7 @@ static Image *ReadOneDJVUImage(LoadContext* lc,const int pagenum, /* Read one DJVU image */ image = lc->image; - /* register Quantum *q; */ + /* Quantum *q; */ logging=LogMagickEvent(CoderEvent,GetMagickModule(), " enter ReadOneDJVUImage()"); (void) logging; @@ -759,7 +759,7 @@ static Image *ReadDJVUImage(const ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t i; /* diff --git a/coders/dng.c b/coders/dng.c index 74dd48a95..a2bdbf348 100644 --- a/coders/dng.c +++ b/coders/dng.c @@ -385,7 +385,7 @@ static Image *ReadDNGImage(const ImageInfo *image_info,ExceptionInfo *exception) libraw_processed_image_t *raw_image; - register ssize_t + ssize_t y; StringInfo @@ -482,10 +482,10 @@ static Image *ReadDNGImage(const ImageInfo *image_info,ExceptionInfo *exception) p=(unsigned short *) raw_image->data; for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *q; - register ssize_t + ssize_t x; q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); diff --git a/coders/dps.c b/coders/dps.c index 05774252c..3794d8e0f 100644 --- a/coders/dps.c +++ b/coders/dps.c @@ -113,13 +113,13 @@ static Image *ReadDPSImage(const ImageInfo *image_info,ExceptionInfo *exception) Pixmap pixmap; - register ssize_t + ssize_t i; - register Quantum + Quantum *q; - register size_t + size_t pixel; Screen @@ -338,7 +338,7 @@ static Image *ReadDPSImage(const ImageInfo *image_info,ExceptionInfo *exception) case DirectClass: default: { - register size_t + size_t color, index; diff --git a/coders/dpx.c b/coders/dpx.c index 4a54f3bf2..5d9bc9e3f 100644 --- a/coders/dpx.c +++ b/coders/dpx.c @@ -635,7 +635,7 @@ static void TimeCodeToString(const size_t timestamp,char *code) unsigned int shift; - register ssize_t + ssize_t i; *code='\0'; @@ -676,7 +676,7 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) QuantumType quantum_type; - register ssize_t + ssize_t i; size_t @@ -1252,7 +1252,7 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType sync; - register Quantum + Quantum *q; size_t @@ -1420,7 +1420,7 @@ static unsigned int StringToTimeCode(const char *key) char buffer[2]; - register ssize_t + ssize_t i; unsigned int @@ -1486,10 +1486,10 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image, QuantumType quantum_type; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i; size_t diff --git a/coders/emf.c b/coders/emf.c index 7ae6c1982..3f219ed92 100644 --- a/coders/emf.c +++ b/coders/emf.c @@ -177,12 +177,12 @@ static MagickBooleanType IsWMF(const unsigned char *magick,const size_t length) # if defined(MAGICKCORE_HAVE__WFOPEN) static size_t UTF8ToUTF16(const unsigned char *utf8,wchar_t *utf16) { - register const unsigned char + const unsigned char *p; if (utf16 != (wchar_t *) NULL) { - register wchar_t + wchar_t *q; wchar_t @@ -269,7 +269,7 @@ static wchar_t *ConvertUTF8ToUTF16(const unsigned char *source) length=UTF8ToUTF16(source,(wchar_t *) NULL); if (length == 0) { - register ssize_t + ssize_t i; /* @@ -463,10 +463,10 @@ static Image *ReadEMFImage(const ImageInfo *image_info,ExceptionInfo *exception) RECT rect; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; RGBQUAD @@ -521,7 +521,7 @@ static Image *ReadEMFImage(const ImageInfo *image_info,ExceptionInfo *exception) char *geometry; - register char + char *p; MagickStatusType @@ -685,10 +685,10 @@ static Image *ReadEMFImage(const ImageInfo *image_info, MagickStatusType flags; - register Quantum + Quantum *q; - register ssize_t + ssize_t x; ssize_t diff --git a/coders/exr.c b/coders/exr.c index 91c8aa4ad..754fe5270 100644 --- a/coders/exr.c +++ b/coders/exr.c @@ -169,7 +169,7 @@ static Image *ReadEXRImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - register Quantum + Quantum *q; size_t @@ -269,7 +269,7 @@ static Image *ReadEXRImage(const ImageInfo *image_info,ExceptionInfo *exception) int yy; - register ssize_t + ssize_t x; q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); @@ -456,10 +456,10 @@ static MagickBooleanType WriteEXRImage(const ImageInfo *image_info,Image *image, MagickBooleanType status; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; ssize_t diff --git a/coders/farbfeld.c b/coders/farbfeld.c index f4e8b8293..e5df835c4 100644 --- a/coders/farbfeld.c +++ b/coders/farbfeld.c @@ -201,7 +201,7 @@ static Image *ReadFARBFELDImage(const ImageInfo *image_info, const void *stream; - register Quantum + Quantum *magick_restrict q; q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); @@ -333,7 +333,7 @@ static MagickBooleanType WriteFARBFELDImage(const ImageInfo *image_info, QuantumInfo *quantum_info; - register const Quantum + const Quantum *p; size_t diff --git a/coders/fits.c b/coders/fits.c index eea7a30e9..f8342d431 100644 --- a/coders/fits.c +++ b/coders/fits.c @@ -179,7 +179,7 @@ static MagickOffsetType GetFITSPixelExtrema(Image *image, MagickSizeType number_pixels; - register MagickOffsetType + MagickOffsetType i; offset=TellBlob(image); @@ -207,7 +207,7 @@ static inline double GetFITSPixelRange(const size_t depth) static void SetFITSUnsignedPixels(const size_t length, const size_t bits_per_pixel,const EndianType endian,unsigned char *pixels) { - register ssize_t + ssize_t i; if (endian != MSBEndian) @@ -270,11 +270,11 @@ static Image *ReadFITSImage(const ImageInfo *image_info, MagickSizeType number_pixels; - register ssize_t + ssize_t i, x; - register Quantum + Quantum *q; ssize_t @@ -321,7 +321,7 @@ static Image *ReadFITSImage(const ImageInfo *image_info, { for ( ; EOFBlob(image) == MagickFalse; ) { - register char + char *p; count=ReadBlob(image,8,(unsigned char *) keyword); @@ -643,7 +643,7 @@ static MagickBooleanType WriteFITSImage(const ImageInfo *image_info, QuantumInfo *quantum_info; - register const Quantum + const Quantum *p; size_t diff --git a/coders/fl32.c b/coders/fl32.c index 10e22d626..38aee855f 100644 --- a/coders/fl32.c +++ b/coders/fl32.c @@ -242,7 +242,7 @@ static Image *ReadFL32Image(const ImageInfo *image_info, const void *stream; - register Quantum + Quantum *magick_restrict q; q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); @@ -370,7 +370,7 @@ static MagickBooleanType WriteFL32Image(const ImageInfo *image_info, QuantumType quantum_type; - register const Quantum + const Quantum *p; size_t diff --git a/coders/flif.c b/coders/flif.c index dcb37783e..555880df0 100644 --- a/coders/flif.c +++ b/coders/flif.c @@ -118,13 +118,13 @@ static Image *ReadFLIFImage(const ImageInfo *image_info, MagickBooleanType status; - register Quantum + Quantum *q; - register ssize_t + ssize_t x; - register unsigned short + unsigned short *p; size_t @@ -395,16 +395,16 @@ static MagickBooleanType WriteFLIFImage(const ImageInfo *image_info, MagickOffsetType scene; - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; - register unsigned char + unsigned char *magick_restrict qc; - register unsigned short + unsigned short *magick_restrict qs; size_t diff --git a/coders/fpx.c b/coders/fpx.c index e5dc10576..84da5e011 100644 --- a/coders/fpx.c +++ b/coders/fpx.c @@ -147,14 +147,14 @@ static Image *ReadFPXImage(const ImageInfo *image_info,ExceptionInfo *exception) Quantum index; - register ssize_t + ssize_t i, x; - register Quantum + Quantum *q; - register unsigned char + unsigned char *a, *b, *g, @@ -790,10 +790,10 @@ static MagickBooleanType WriteFPXImage(const ImageInfo *image_info,Image *image, QuantumType quantum_type; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i; size_t diff --git a/coders/ghostscript-private.h b/coders/ghostscript-private.h index 8f48be10d..fe911dc48 100644 --- a/coders/ghostscript-private.h +++ b/coders/ghostscript-private.h @@ -109,7 +109,7 @@ static inline MagickBooleanType InvokeGhostscriptDelegate( argc, code; - register ssize_t + ssize_t i; #if defined(MAGICKCORE_WINDOWS_SUPPORT) @@ -226,7 +226,7 @@ static inline void ReadGhostScriptXMPProfile(MagickByteBuffer *buffer, found_end, status; - register char + char *p; size_t diff --git a/coders/gif.c b/coders/gif.c index 7ebb3592c..6a6e05ad7 100644 --- a/coders/gif.c +++ b/coders/gif.c @@ -202,7 +202,7 @@ static LZWInfo *AcquireLZWInfo(Image *image,const size_t data_size) LZWInfo *lzw_info; - register ssize_t + ssize_t i; size_t @@ -267,7 +267,7 @@ static inline int GetNextLZWCode(LZWInfo *lzw_info,const size_t bits) int code; - register ssize_t + ssize_t i; size_t @@ -430,10 +430,10 @@ static MagickBooleanType DecodeImage(Image *image,const ssize_t opacity, offset=0; for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception); @@ -654,10 +654,10 @@ static MagickBooleanType EncodeImage(const ImageInfo *image_info,Image *image, waiting_code=0; for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,offset,image->columns,1,exception); @@ -978,10 +978,10 @@ static Image *ReadGIFImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *p; size_t @@ -1526,10 +1526,10 @@ static MagickBooleanType WriteGIFImage(const ImageInfo *image_info,Image *image, RectangleInfo page; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *q; size_t @@ -1729,7 +1729,7 @@ static MagickBooleanType WriteGIFImage(const ImageInfo *image_info,Image *image, value=GetImageProperty(image,"comment",exception); if (value != (const char *) NULL) { - register const char + const char *p; size_t diff --git a/coders/gradient.c b/coders/gradient.c index f8eaefab4..9f89e26c0 100644 --- a/coders/gradient.c +++ b/coders/gradient.c @@ -104,10 +104,10 @@ static Image *ReadXCImage(const ImageInfo *image_info,ExceptionInfo *exception) PixelInfo pixel; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; ssize_t @@ -196,7 +196,7 @@ static Image *ReadGRADIENTImage(const ImageInfo *image_info, (void) CopyMagickString(stop_color,"black",MagickPathExtent); if (*image_info->filename != '\0') { - register char + char *p; (void) CopyMagickString(start_color,image_info->filename, diff --git a/coders/gray.c b/coders/gray.c index c4643f353..c007539c4 100644 --- a/coders/gray.c +++ b/coders/gray.c @@ -119,7 +119,7 @@ static Image *ReadGRAYImage(const ImageInfo *image_info, QuantumType quantum_type; - register ssize_t + ssize_t i; size_t @@ -227,13 +227,13 @@ static Image *ReadGRAYImage(const ImageInfo *image_info, } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -306,13 +306,13 @@ static Image *ReadGRAYImage(const ImageInfo *image_info, { for (i=0; i < (ssize_t) (image->alpha_trait != UndefinedPixelTrait ? 4 : 3); i++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -387,13 +387,13 @@ static Image *ReadGRAYImage(const ImageInfo *image_info, } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -441,13 +441,13 @@ static Image *ReadGRAYImage(const ImageInfo *image_info, { for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -532,13 +532,13 @@ static Image *ReadGRAYImage(const ImageInfo *image_info, stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -605,13 +605,13 @@ static Image *ReadGRAYImage(const ImageInfo *image_info, stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -870,7 +870,7 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info, */ for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -898,7 +898,7 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info, */ for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -934,7 +934,7 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info, */ for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -956,7 +956,7 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info, { for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -998,7 +998,7 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info, return(status); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1027,7 +1027,7 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info, return(status); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); diff --git a/coders/hald.c b/coders/hald.c index b18e6dce5..665707344 100644 --- a/coders/hald.c +++ b/coders/hald.c @@ -138,7 +138,7 @@ static Image *ReadHALDImage(const ImageInfo *image_info, green, red; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) diff --git a/coders/hdr.c b/coders/hdr.c index a33d6e28d..eea36b13b 100644 --- a/coders/hdr.c +++ b/coders/hdr.c @@ -153,10 +153,10 @@ static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception) status, value_expected; - register Quantum + Quantum *q; - register ssize_t + ssize_t i, x; @@ -204,7 +204,7 @@ static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception) char *comment; - register char + char *p; size_t @@ -244,7 +244,7 @@ static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception) c=ReadBlobByte(image); else { - register char + char *p; /* @@ -424,7 +424,7 @@ static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception) } else { - register unsigned char + unsigned char *p; p=pixels; @@ -598,7 +598,7 @@ static size_t HDRWriteRunlengthPixels(Image *image,unsigned char *pixels) { #define MinimumRunlength 4 - register size_t + size_t p, q; @@ -670,10 +670,10 @@ static MagickBooleanType WriteHDRImage(const ImageInfo *image_info,Image *image, MagickBooleanType status; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; diff --git a/coders/heic.c b/coders/heic.c index f24871e7b..493357592 100644 --- a/coders/heic.c +++ b/coders/heic.c @@ -341,10 +341,10 @@ static MagickBooleanType ReadHEICImageByID(const ImageInfo *image_info, p_a=heif_image_get_plane_readonly(heif_image,heif_channel_Alpha,&stride_a); for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *q; - register ssize_t + ssize_t x; q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); @@ -459,7 +459,7 @@ static Image *ReadHEICImage(const ImageInfo *image_info, count=(size_t) heif_context_get_number_of_top_level_images(heif_context); if ((status != MagickFalse) && (count > 1)) { - register size_t + size_t i; image_ids=(heif_item_id *) AcquireQuantumMemory((size_t) count, @@ -759,7 +759,7 @@ static void WriteProfile(struct heif_context *context,Image *image, const StringInfo *profile; - register ssize_t + ssize_t i; size_t @@ -894,10 +894,10 @@ static MagickBooleanType WriteHEICImageYCbCr(Image *image, */ for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -970,7 +970,7 @@ static MagickBooleanType WriteHEICImageRGBA(Image *image, */ for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); diff --git a/coders/histogram.c b/coders/histogram.c index bbbfc9c0d..21a5b20b3 100644 --- a/coders/histogram.c +++ b/coders/histogram.c @@ -199,14 +199,14 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info, RectangleInfo geometry; - register const Quantum + const Quantum *p; - register Quantum + Quantum *q, *r; - register ssize_t + ssize_t x; size_t diff --git a/coders/hrz.c b/coders/hrz.c index 87f18c946..472a2622b 100644 --- a/coders/hrz.c +++ b/coders/hrz.c @@ -100,13 +100,13 @@ static Image *ReadHRZImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; - register unsigned char + unsigned char *p; ssize_t @@ -278,14 +278,14 @@ static MagickBooleanType WriteHRZImage(const ImageInfo *image_info,Image *image, MagickBooleanType status; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x, y; - register unsigned char + unsigned char *q; ssize_t diff --git a/coders/html.c b/coders/html.c index 062197dc3..7e526fc59 100644 --- a/coders/html.c +++ b/coders/html.c @@ -225,7 +225,7 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info, RectangleInfo geometry; - register char + char *p; /* diff --git a/coders/icon.c b/coders/icon.c index 53744b3d2..2853b85b0 100644 --- a/coders/icon.c +++ b/coders/icon.c @@ -190,14 +190,14 @@ static Image *ReadICONImage(const ImageInfo *image_info, MagickSizeType extent; - register ssize_t + ssize_t i, x; - register Quantum + Quantum *q; - register unsigned char + unsigned char *p; size_t @@ -372,7 +372,7 @@ static Image *ReadICONImage(const ImageInfo *image_info, } if (image->storage_class == PseudoClass) { - register ssize_t + ssize_t j; unsigned char @@ -815,7 +815,7 @@ static Image *AutoResizeImage(const Image *image,const char *option, *images, *resized; - register ssize_t + ssize_t i; size_t @@ -879,14 +879,14 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info, offset, scene; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; - register unsigned char + unsigned char *q; size_t diff --git a/coders/inline.c b/coders/inline.c index fb1fb9a81..6849df362 100644 --- a/coders/inline.c +++ b/coders/inline.c @@ -101,7 +101,7 @@ static Image *ReadINLINEImage(const ImageInfo *image_info, MagickBooleanType status; - register size_t + size_t i; size_t diff --git a/coders/ipl.c b/coders/ipl.c index 1b83116c7..c5acd4e2e 100644 --- a/coders/ipl.c +++ b/coders/ipl.c @@ -175,7 +175,7 @@ static Image *ReadIPLImage(const ImageInfo *image_info,ExceptionInfo *exception) Image *image; MagickBooleanType status; - register Quantum *q; + Quantum *q; unsigned char magick[12], *pixels; ssize_t count; ssize_t y; @@ -515,7 +515,7 @@ static MagickBooleanType WriteIPLImage(const ImageInfo *image_info,Image *image, MagickOffsetType scene; - register const Quantum + const Quantum *p; QuantumInfo diff --git a/coders/jbig.c b/coders/jbig.c index 7a38a9ecd..91afb1b2c 100644 --- a/coders/jbig.c +++ b/coders/jbig.c @@ -124,13 +124,13 @@ static Image *ReadJBIGImage(const ImageInfo *image_info, Quantum index; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; - register unsigned char + unsigned char *p; ssize_t @@ -419,13 +419,13 @@ static MagickBooleanType WriteJBIGImage(const ImageInfo *image_info, MemoryInfo *pixel_info; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; - register unsigned char + unsigned char *q; size_t diff --git a/coders/jnx.c b/coders/jnx.c index b53b5424e..93aeaa685 100644 --- a/coders/jnx.c +++ b/coders/jnx.c @@ -141,7 +141,7 @@ static Image *ReadJNXImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - register ssize_t + ssize_t i; /* @@ -202,7 +202,7 @@ static Image *ReadJNXImage(const ImageInfo *image_info,ExceptionInfo *exception) *jnx_level_info[i].copyright='\0'; if (jnx_info.version > 3) { - register ssize_t + ssize_t j; unsigned short @@ -227,7 +227,7 @@ static Image *ReadJNXImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickOffsetType offset; - register ssize_t + ssize_t j; offset=SeekBlob(image,(MagickOffsetType) jnx_level_info[i].offset,SEEK_SET); diff --git a/coders/jp2.c b/coders/jp2.c index 06f5c9d8f..4295a4096 100644 --- a/coders/jp2.c +++ b/coders/jp2.c @@ -277,7 +277,7 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception) opj_stream_t *jp2_stream; - register ssize_t + ssize_t i; ssize_t @@ -456,10 +456,10 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception) } for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; q=GetAuthenticPixels(image,0,y,image->columns,1,exception); @@ -834,7 +834,7 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image, opj_stream_t *jp2_stream; - register ssize_t + ssize_t i; ssize_t @@ -907,7 +907,7 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image, option=GetImageOption(image_info,"jp2:quality"); if (option != (const char *) NULL) { - register const char + const char *p; /* @@ -945,7 +945,7 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image, option=GetImageOption(image_info,"jp2:rate"); if (option != (const char *) NULL) { - register const char + const char *p; /* @@ -1035,7 +1035,7 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image, */ for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *p; ssize_t @@ -1051,7 +1051,7 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image, double scale; - register int + int *q; scale=(double) (((size_t) 1UL << jp2_image->comps[i].prec)-1)/ diff --git a/coders/jpeg.c b/coders/jpeg.c index 1f8c858be..a07849dbb 100644 --- a/coders/jpeg.c +++ b/coders/jpeg.c @@ -427,10 +427,10 @@ static boolean ReadProfileData(j_decompress_ptr jpeg_info,const size_t index, Image *image; - register unsigned char + unsigned char *p; - register ssize_t + ssize_t i; error_manager=(ErrorManager *) jpeg_info->client_data; @@ -515,7 +515,7 @@ static boolean ReadICCProfile(j_decompress_ptr jpeg_info) char magick[13]; - register ssize_t + ssize_t i; size_t @@ -559,7 +559,7 @@ static boolean ReadIPTCProfile(j_decompress_ptr jpeg_info) char magick[MagickPathExtent]; - register ssize_t + ssize_t i; size_t @@ -643,7 +643,7 @@ static boolean ReadXmlProfile(j_decompress_ptr jpeg_info) MagickBooleanType status; - register unsigned char + unsigned char *p; size_t @@ -762,7 +762,7 @@ static void JPEGSetImageQuality(struct jpeg_decompress_struct *jpeg_info, qvalue, sum; - register ssize_t + ssize_t i; /* @@ -947,7 +947,7 @@ static void JPEGDestroyDecompress(j_decompress_ptr jpeg_info) ErrorManager *error_manager; - register size_t + size_t i; error_manager=(ErrorManager *) jpeg_info->client_data; @@ -970,10 +970,10 @@ static MagickBooleanType JPEGSetImageProfiles(ErrorManager *error_manager) MagickBooleanType status; - register unsigned char + unsigned char *p; - register ssize_t + ssize_t i; StringInfo @@ -1060,7 +1060,7 @@ static Image *ReadJPEGImage_(const ImageInfo *image_info, Quantum index; - register ssize_t + ssize_t i; struct jpeg_error_mgr @@ -1069,7 +1069,7 @@ static Image *ReadJPEGImage_(const ImageInfo *image_info, struct jpeg_progress_mgr jpeg_progress; - register JSAMPLE + JSAMPLE *p; size_t @@ -1415,10 +1415,10 @@ static Image *ReadJPEGImage_(const ImageInfo *image_info, scanline[0]=(JSAMPROW) jpeg_pixels; for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (jpeg_read_scanlines(jpeg_info,scanline,1) != 1) @@ -1777,7 +1777,7 @@ static QuantizationTable *GetQuantizationTable(const char *filename, double value; - register ssize_t + ssize_t i; ssize_t @@ -2000,7 +2000,7 @@ static void WriteProfile(j_compress_ptr jpeg_info,Image *image, MagickBooleanType iptc; - register ssize_t + ssize_t i; size_t @@ -2045,7 +2045,7 @@ static void WriteProfile(j_compress_ptr jpeg_info,Image *image, } if (LocaleCompare(name,"ICC") == 0) { - register unsigned char + unsigned char *p; tag_length=strlen(ICC_PROFILE); @@ -2066,7 +2066,7 @@ static void WriteProfile(j_compress_ptr jpeg_info,Image *image, if (((LocaleCompare(name,"IPTC") == 0) || (LocaleCompare(name,"8BIM") == 0)) && (iptc == MagickFalse)) { - register unsigned char + unsigned char *p; size_t @@ -2145,13 +2145,13 @@ static char **SamplingFactorToList(const char *text) char **textlist; - register char + char *q; - register const char + const char *p; - register ssize_t + ssize_t i; if (text == (char *) NULL) @@ -2216,10 +2216,10 @@ static MagickBooleanType WriteJPEGImage_(const ImageInfo *image_info, MemoryInfo *memory_info; - register JSAMPLE + JSAMPLE *q; - register ssize_t + ssize_t i; ssize_t @@ -2809,10 +2809,10 @@ static MagickBooleanType WriteJPEGImage_(const ImageInfo *image_info, (jpeg_info->in_color_space == JCS_YCbCr)) for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -2836,10 +2836,10 @@ static MagickBooleanType WriteJPEGImage_(const ImageInfo *image_info, if (jpeg_info->in_color_space == JCS_GRAYSCALE) for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -2861,10 +2861,10 @@ static MagickBooleanType WriteJPEGImage_(const ImageInfo *image_info, else for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -2897,10 +2897,10 @@ static MagickBooleanType WriteJPEGImage_(const ImageInfo *image_info, if (jpeg_info->in_color_space == JCS_GRAYSCALE) for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -2924,10 +2924,10 @@ static MagickBooleanType WriteJPEGImage_(const ImageInfo *image_info, (jpeg_info->in_color_space == JCS_YCbCr)) for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -2950,10 +2950,10 @@ static MagickBooleanType WriteJPEGImage_(const ImageInfo *image_info, else for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); diff --git a/coders/json.c b/coders/json.c index 8d719dd97..a50bf613a 100644 --- a/coders/json.c +++ b/coders/json.c @@ -193,10 +193,10 @@ static void JSONFormatLocaleFile(FILE *file,const char *format, char *escaped_json; - register char + char *q; - register const char + const char *p; size_t @@ -319,7 +319,7 @@ static ChannelStatistics *GetLocationStatistics(const Image *image, ChannelStatistics *channel_statistics; - register ssize_t + ssize_t i; ssize_t @@ -354,10 +354,10 @@ static ChannelStatistics *GetLocationStatistics(const Image *image, } for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -365,7 +365,7 @@ static ChannelStatistics *GetLocationStatistics(const Image *image, break; for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; if (GetPixelReadMask(image,p) <= (QuantumRange/2)) @@ -573,7 +573,7 @@ static ssize_t PrintChannelLocations(FILE *file,const Image *image, n=0; for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *p; ssize_t @@ -620,7 +620,7 @@ static ssize_t PrintChannelMoments(FILE *file,const PixelChannel channel, const char *name,const MagickBooleanType separator, const ChannelMoments *channel_moments) { - register ssize_t + ssize_t i; ssize_t @@ -658,7 +658,7 @@ static ssize_t PrintChannelMoments(FILE *file,const PixelChannel channel, static ssize_t PrintChannelPerceptualHash(Image *image,FILE *file, const ChannelPerceptualHash *channel_phash) { - register ssize_t + ssize_t i; ssize_t @@ -675,7 +675,7 @@ static ssize_t PrintChannelPerceptualHash(Image *image,FILE *file, (void) FormatLocaleFile(file,"],\n"); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - register ssize_t + ssize_t j; PixelChannel channel = GetPixelChannelChannel(image,i); @@ -685,7 +685,7 @@ static ssize_t PrintChannelPerceptualHash(Image *image,FILE *file, n=FormatLocaleFile(file," \"Channel%.20g\": {\n",(double) channel); for (j=0; j < MaximumNumberOfPerceptualHashes; j++) { - register ssize_t + ssize_t k; n+=FormatLocaleFile(file," \"PH%.20g\": [",(double) j+1); @@ -754,7 +754,7 @@ static void EncodeIptcProfile(FILE *file,const StringInfo *profile) record, sentinel; - register ssize_t + ssize_t i, j, k; @@ -954,10 +954,10 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, MagickBooleanType ping; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; @@ -1350,7 +1350,7 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, x=0; if (image->alpha_trait != UndefinedPixelTrait) { - register const Quantum + const Quantum *p; p=(const Quantum *) NULL; @@ -1381,7 +1381,7 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, } if (image->storage_class == PseudoClass) { - register PixelInfo + PixelInfo *magick_restrict p; (void) FormatLocaleFile(file," \"colormapEntries\": %.20g,\n", @@ -1502,7 +1502,7 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, ImageInfo *image_info; - register char + char *p, *q; diff --git a/coders/kernel.c b/coders/kernel.c index fcd4c7fe5..69b3bc7ce 100644 --- a/coders/kernel.c +++ b/coders/kernel.c @@ -190,10 +190,10 @@ static MagickBooleanType WriteKERNELImage(const ImageInfo *image_info, */ for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); diff --git a/coders/mac.c b/coders/mac.c index a159bb1dd..315cb6221 100644 --- a/coders/mac.c +++ b/coders/mac.c @@ -95,13 +95,13 @@ static Image *ReadMACImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - register Quantum + Quantum *q; - register ssize_t + ssize_t x; - register unsigned char + unsigned char *p; size_t diff --git a/coders/magick.c b/coders/magick.c index b485e2e1e..7f0a8cd91 100644 --- a/coders/magick.c +++ b/coders/magick.c @@ -13044,7 +13044,7 @@ static Image *ReadMAGICKImage(const ImageInfo *image_info, ImageInfo *blob_info; - register ssize_t + ssize_t i; size_t @@ -13231,10 +13231,10 @@ static MagickBooleanType WriteMAGICKImage(const ImageInfo *image_info, size_t length; - register char + char *p; - register ssize_t + ssize_t i; void diff --git a/coders/map.c b/coders/map.c index a279ff7f5..4d86b88fe 100644 --- a/coders/map.c +++ b/coders/map.c @@ -108,16 +108,16 @@ static Image *ReadMAPImage(const ImageInfo *image_info,ExceptionInfo *exception) Quantum index; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *p; size_t @@ -353,14 +353,14 @@ static MagickBooleanType WriteMAPImage(const ImageInfo *image_info,Image *image, MagickBooleanType status; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; - register unsigned char + unsigned char *q; size_t diff --git a/coders/mask.c b/coders/mask.c index 59ccb2e30..2fb2a2014 100644 --- a/coders/mask.c +++ b/coders/mask.c @@ -245,13 +245,13 @@ static Image *MaskImage(const Image *image,ExceptionInfo *exception) mask_view=AcquireAuthenticCacheView(mask_image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) diff --git a/coders/mat.c b/coders/mat.c index 2ddeb06a5..cb6e77916 100644 --- a/coders/mat.c +++ b/coders/mat.c @@ -189,7 +189,7 @@ static void InsertComplexDoubleRow(Image *image,double *p,int y,double MinVal, { double f; int x; - register Quantum *q; + Quantum *q; if (MinVal >= 0) MinVal = -1; @@ -252,7 +252,7 @@ static void InsertComplexFloatRow(Image *image,float *p,int y,double MinVal, { double f; int x; - register Quantum *q; + Quantum *q; if (MinVal >= 0) MinVal = -1; @@ -624,7 +624,7 @@ static Image *ReadMATImageV4(const ImageInfo *image_info,Image *image, QuantumFormatType format_type; - register ssize_t + ssize_t i; ssize_t @@ -752,7 +752,7 @@ static Image *ReadMATImageV4(const ImageInfo *image_info,Image *image, pixels=(unsigned char *) GetQuantumPixels(quantum_info); for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; count=ReadBlob(image,depth/8*image->columns,(char *) pixels); @@ -874,7 +874,7 @@ static Image *ReadMATImage(const ImageInfo *image_info,ExceptionInfo *exception) { Image *image, *image2=NULL, *rotated_image; - register Quantum *q; + Quantum *q; unsigned int status; MATHeader MATLAB_HDR; diff --git a/coders/matte.c b/coders/matte.c index 0bf3ce6b6..956b45261 100644 --- a/coders/matte.c +++ b/coders/matte.c @@ -164,13 +164,13 @@ static MagickBooleanType WriteMATTEImage(const ImageInfo *image_info, MagickBooleanType status; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; ssize_t diff --git a/coders/meta.c b/coders/meta.c index 253717c81..20f39683a 100644 --- a/coders/meta.c +++ b/coders/meta.c @@ -197,7 +197,7 @@ static size_t convertHTMLcodes(char *s) int value; - register size_t + size_t i; size_t @@ -1616,10 +1616,10 @@ static size_t GetIPTCStream(unsigned char **info,size_t length) int c; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *p; size_t diff --git a/coders/miff.c b/coders/miff.c index 1581eb622..29ef12712 100644 --- a/coders/miff.c +++ b/coders/miff.c @@ -481,7 +481,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, QuantumType quantum_type; - register ssize_t + ssize_t i; size_t @@ -552,7 +552,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, image->compression=NoCompression; while ((isgraph((int) ((unsigned char) c)) != 0) && (c != (int) ':')) { - register char + char *p; if (c == (int) '{') @@ -1127,7 +1127,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, } if (image->montage != (char *) NULL) { - register char + char *p; /* @@ -1425,10 +1425,10 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, length=0; for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; if (status == MagickFalse) @@ -2032,7 +2032,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, QuantumType quantum_type; - register ssize_t + ssize_t i; size_t @@ -2439,7 +2439,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, case 32: default: { - register unsigned int + unsigned int long_pixel; long_pixel=ScaleQuantumToLong((Quantum) @@ -2455,7 +2455,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, } case 16: { - register unsigned short + unsigned short short_pixel; short_pixel=ScaleQuantumToShort((Quantum) @@ -2471,7 +2471,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, } case 8: { - register unsigned char + unsigned char char_pixel; char_pixel=(unsigned char) ScaleQuantumToChar((Quantum) @@ -2556,10 +2556,10 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, pixels=(unsigned char *) GetQuantumPixels(quantum_info); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; if (status == MagickFalse) diff --git a/coders/mono.c b/coders/mono.c index e8237564a..6b882eb46 100644 --- a/coders/mono.c +++ b/coders/mono.c @@ -105,10 +105,10 @@ static Image *ReadMONOImage(const ImageInfo *image_info, MagickBooleanType status; - register Quantum + Quantum *q; - register ssize_t + ssize_t x; size_t @@ -288,10 +288,10 @@ static MagickBooleanType WriteMONOImage(const ImageInfo *image_info, MagickBooleanType status; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; size_t diff --git a/coders/mpc.c b/coders/mpc.c index 178cfe256..f74e99956 100644 --- a/coders/mpc.c +++ b/coders/mpc.c @@ -174,7 +174,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickStatusType flags; - register ssize_t + ssize_t i; size_t @@ -230,7 +230,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception) image->compression=NoCompression; while ((isgraph((int) ((unsigned char) c)) != 0) && (c != (int) ':')) { - register char + char *p; if (c == (int) '{') @@ -804,7 +804,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception) } if (image->montage != (char *) NULL) { - register char + char *p; /* @@ -1142,7 +1142,7 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image, offset, scene; - register ssize_t + ssize_t i; size_t diff --git a/coders/msl.c b/coders/msl.c index ea2329132..50a73b51e 100644 --- a/coders/msl.c +++ b/coders/msl.c @@ -660,7 +660,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, RectangleInfo geometry; - register ssize_t + ssize_t i; size_t @@ -1955,10 +1955,10 @@ static void MSLStartElement(void *context,const xmlChar *tag, opacity, y; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; CacheView @@ -3418,7 +3418,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, msl_info->image[n]=next_image; else { - register Image + Image *p; /* @@ -4452,7 +4452,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, name[MagickPathExtent], filename[MagickPathExtent]; - register char + char *p; StringInfo @@ -4464,7 +4464,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, if ((*p == ':') && (IsPathDirectory(keyword) < 0) && (IsPathAccessible(keyword) == MagickFalse)) { - register char + char *q; /* @@ -7532,10 +7532,10 @@ static void MSLCharacters(void *context,const xmlChar *c,int length) MSLInfo *msl_info; - register char + char *p; - register ssize_t + ssize_t i; /* diff --git a/coders/mtv.c b/coders/mtv.c index 118a63d97..fb835db4c 100644 --- a/coders/mtv.c +++ b/coders/mtv.c @@ -103,13 +103,13 @@ static Image *ReadMTVImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; - register unsigned char + unsigned char *p; ssize_t @@ -339,13 +339,13 @@ static MagickBooleanType WriteMTVImage(const ImageInfo *image_info,Image *image, MagickOffsetType scene; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; - register unsigned char + unsigned char *q; size_t diff --git a/coders/mvg.c b/coders/mvg.c index 3e7db1014..5f8778c9a 100644 --- a/coders/mvg.c +++ b/coders/mvg.c @@ -157,7 +157,7 @@ static Image *ReadMVGImage(const ImageInfo *image_info,ExceptionInfo *exception) char primitive[MagickPathExtent]; - register char + char *p; SegmentInfo diff --git a/coders/null.c b/coders/null.c index ff88c63d0..21b301f73 100644 --- a/coders/null.c +++ b/coders/null.c @@ -106,10 +106,10 @@ static Image *ReadNULLImage(const ImageInfo *image_info, PixelInfo background; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; ssize_t diff --git a/coders/otb.c b/coders/otb.c index 24fb92794..7b965162a 100644 --- a/coders/otb.c +++ b/coders/otb.c @@ -108,10 +108,10 @@ static Image *ReadOTBImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; ssize_t @@ -307,10 +307,10 @@ static MagickBooleanType WriteOTBImage(const ImageInfo *image_info,Image *image, MagickBooleanType status; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; ssize_t diff --git a/coders/palm.c b/coders/palm.c index 6a3c674dd..32716dedb 100644 --- a/coders/palm.c +++ b/coders/palm.c @@ -191,7 +191,7 @@ static MagickBooleanType */ static ssize_t FindColor(PixelInfo *packet) { - register ssize_t + ssize_t i; for (i=0; i < 256; i++) @@ -248,11 +248,11 @@ static Image *ReadPALMImage(const ImageInfo *image_info, Quantum index; - register ssize_t + ssize_t i, x; - register Quantum + Quantum *q; size_t @@ -708,13 +708,13 @@ static MagickBooleanType WritePALMImage(const ImageInfo *image_info, QuantizeInfo *quantize_info; - register ssize_t + ssize_t x; - register const Quantum + const Quantum *p; - register Quantum + Quantum *q; ssize_t diff --git a/coders/pango.c b/coders/pango.c index ed4460e93..225433df2 100644 --- a/coders/pango.c +++ b/coders/pango.c @@ -161,7 +161,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info, RectangleInfo page; - register unsigned char + unsigned char *p; size_t @@ -434,10 +434,10 @@ static Image *ReadPANGOImage(const ImageInfo *image_info, GetPixelInfo(image,&fill_color); for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *q; - register ssize_t + ssize_t x; q=GetAuthenticPixels(image,0,y,image->columns,1,exception); diff --git a/coders/pattern.c b/coders/pattern.c index 846bfdd14..d7ef43117 100644 --- a/coders/pattern.c +++ b/coders/pattern.c @@ -949,7 +949,7 @@ static Image *ReadPATTERNImage(const ImageInfo *image_info, ImageInfo *blob_info; - register ssize_t + ssize_t i; size_t diff --git a/coders/pcd.c b/coders/pcd.c index 1ed583435..676333a2e 100644 --- a/coders/pcd.c +++ b/coders/pcd.c @@ -147,14 +147,14 @@ static MagickBooleanType DecodeImage(Image *image,unsigned char *luma, PCDTable *pcd_table[3]; - register ssize_t + ssize_t i, j; - register PCDTable + PCDTable *r; - register unsigned char + unsigned char *p, *q; @@ -404,7 +404,7 @@ static Image *OverviewImage(const ImageInfo *image_info,Image *image, MontageInfo *montage_info; - register Image + Image *p; /* @@ -429,11 +429,11 @@ static Image *OverviewImage(const ImageInfo *image_info,Image *image, static void Upsample(const size_t width,const size_t height, const size_t scaled_width,unsigned char *pixels) { - register ssize_t + ssize_t x, y; - register unsigned char + unsigned char *p, *q, *r; @@ -505,14 +505,14 @@ static Image *ReadPCDImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickSizeType number_pixels; - register ssize_t + ssize_t i, y; - register Quantum + Quantum *q; - register unsigned char + unsigned char *c1, *c2, *yy; @@ -661,7 +661,7 @@ static Image *ReadPCDImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickProgressMonitor progress_monitor; - register ssize_t + ssize_t j; /* @@ -1001,11 +1001,11 @@ static MagickBooleanType WritePCDTile(Image *image,const char *page_geometry, RectangleInfo geometry; - register const Quantum + const Quantum *p, *q; - register ssize_t + ssize_t i, x; @@ -1123,7 +1123,7 @@ static MagickBooleanType WritePCDImage(const ImageInfo *image_info,Image *image, MagickBooleanType status; - register ssize_t + ssize_t i; assert(image_info != (const ImageInfo *) NULL); diff --git a/coders/pcl.c b/coders/pcl.c index 7b201322b..aee171a22 100644 --- a/coders/pcl.c +++ b/coders/pcl.c @@ -179,10 +179,10 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception) bounding_box, page; - register char + char *p; - register ssize_t + ssize_t c; SegmentInfo @@ -500,11 +500,11 @@ static size_t PCLDeltaCompressImage(const size_t length, j, replacement; - register ssize_t + ssize_t i, x; - register unsigned char + unsigned char *q; q=compress_pixels; @@ -568,10 +568,10 @@ static size_t PCLPackbitsCompressImage(const size_t length, int count; - register ssize_t + ssize_t x; - register unsigned char + unsigned char *q; ssize_t @@ -681,11 +681,11 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image, MagickOffsetType scene; - register const Quantum *p; + const Quantum *p; - register ssize_t i, x; + ssize_t i, x; - register unsigned char *q; + unsigned char *q; size_t density, @@ -872,7 +872,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image, { case 1: { - register unsigned char + unsigned char bit, byte; diff --git a/coders/pcx.c b/coders/pcx.c index 4332dc0ad..d2bc8f822 100644 --- a/coders/pcx.c +++ b/coders/pcx.c @@ -234,16 +234,16 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception) PCXInfo pcx_info; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *p, *r; @@ -568,7 +568,7 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception) { case 1: { - register ssize_t + ssize_t bit; for (x=0; x < ((ssize_t) image->columns-7); x+=8) @@ -804,10 +804,10 @@ ModuleExport void UnregisterPCXImage(void) static MagickBooleanType PCXWritePixels(PCXInfo *pcx_info, const unsigned char *pixels,Image *image) { - register const unsigned char + const unsigned char *q; - register ssize_t + ssize_t i, x; @@ -875,14 +875,14 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image, PCXInfo pcx_info; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; - register unsigned char + unsigned char *q; size_t @@ -1128,7 +1128,7 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image, } else { - register unsigned char + unsigned char bit, byte; diff --git a/coders/pdb.c b/coders/pdb.c index 6be33140c..eddc81829 100644 --- a/coders/pdb.c +++ b/coders/pdb.c @@ -288,13 +288,13 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception) Quantum index; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; - register unsigned char + unsigned char *p; size_t @@ -586,7 +586,7 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception) int c; - register char + char *p; size_t @@ -762,13 +762,13 @@ static MagickBooleanType WritePDBImage(const ImageInfo *image_info,Image *image, QuantumInfo *quantum_info; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; - register unsigned char + unsigned char *q; size_t diff --git a/coders/pdf.c b/coders/pdf.c index 640b11ecc..6d1cd2ca1 100644 --- a/coders/pdf.c +++ b/coders/pdf.c @@ -207,10 +207,10 @@ static void ReadPDFInfo(const ImageInfo *image_info,Image *image, MagickByteBuffer buffer; - register char + char *p; - register ssize_t + ssize_t i; SegmentInfo @@ -376,7 +376,7 @@ static char *SanitizeDelegateString(const char *source) const char *q; - register char + char *p; static char @@ -445,7 +445,7 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception) RectangleInfo page; - register ssize_t + ssize_t i; size_t @@ -910,10 +910,10 @@ static char *EscapeParenthesis(const char *source) char *destination; - register char + char *q; - register const char + const char *p; size_t @@ -951,12 +951,12 @@ static char *EscapeParenthesis(const char *source) static size_t UTF8ToUTF16(const unsigned char *utf8,wchar_t *utf16) { - register const unsigned char + const unsigned char *p; if (utf16 != (wchar_t *) NULL) { - register wchar_t + wchar_t *q; wchar_t @@ -1040,7 +1040,7 @@ static wchar_t *ConvertUTF8ToUTF16(const unsigned char *source,size_t *length) *length=UTF8ToUTF16(source,(wchar_t *) NULL); if (*length == 0) { - register ssize_t + ssize_t i; /* @@ -1113,7 +1113,7 @@ static MagickBooleanType WritePOCKETMODImage(const ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t i; assert(image_info != (const ImageInfo *) NULL); @@ -1296,13 +1296,13 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image, media_info, page_info; - register const Quantum + const Quantum *p; - register unsigned char + unsigned char *q; - register ssize_t + ssize_t i, x; diff --git a/coders/pes.c b/coders/pes.c index 7b5863654..be9107280 100644 --- a/coders/pes.c +++ b/coders/pes.c @@ -452,7 +452,7 @@ static Image *ReadPESImage(const ImageInfo *image_info,ExceptionInfo *exception) SegmentInfo bounds; - register ssize_t + ssize_t i; size_t diff --git a/coders/pgx.c b/coders/pgx.c index e820c77fe..db1691682 100644 --- a/coders/pgx.c +++ b/coders/pgx.c @@ -213,7 +213,7 @@ static Image *ReadPGXImage(const ImageInfo *image_info,ExceptionInfo *exception) const void *stream; - register Quantum + Quantum *magick_restrict q; q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); @@ -339,7 +339,7 @@ static MagickBooleanType WritePGXImage(const ImageInfo *image_info,Image *image, QuantumInfo *quantum_info; - register const Quantum + const Quantum *p; size_t diff --git a/coders/pict.c b/coders/pict.c index 08c466742..6511547b7 100644 --- a/coders/pict.c +++ b/coders/pict.c @@ -329,13 +329,13 @@ static const unsigned char *UnpackScanline( const unsigned char *magick_restrict pixels,const unsigned int bits_per_pixel, unsigned char *scanline,MagickSizeType *bytes_per_line) { - register const unsigned char + const unsigned char *p; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *q; p=pixels; @@ -402,13 +402,13 @@ static unsigned char *DecodeImage(Image *blob,Image *image, MagickSizeType number_pixels; - register const unsigned char + const unsigned char *p; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *q; size_t @@ -586,13 +586,13 @@ static size_t EncodeImage(Image *image,const unsigned char *scanline, #define MaxCount 128 #define MaxPackbitsRunlength 128 - register const unsigned char + const unsigned char *p; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *q; size_t @@ -857,10 +857,10 @@ static Image *ReadPICTImage(const ImageInfo *image_info, Quantum index; - register Quantum + Quantum *q; - register ssize_t + ssize_t i, x; @@ -1143,7 +1143,7 @@ static Image *ReadPICTImage(const ImageInfo *image_info, source, destination; - register unsigned char + unsigned char *p; size_t @@ -1688,10 +1688,10 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info, size_rectangle, source_rectangle; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; @@ -2056,7 +2056,7 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info, } else { - register unsigned char + unsigned char *blue, *green, *opacity, diff --git a/coders/pix.c b/coders/pix.c index bb42bd793..312771cc0 100644 --- a/coders/pix.c +++ b/coders/pix.c @@ -100,10 +100,10 @@ static Image *ReadPIXImage(const ImageInfo *image_info,ExceptionInfo *exception) index, red; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; size_t diff --git a/coders/plasma.c b/coders/plasma.c index de62ca6dd..143e9f86d 100644 --- a/coders/plasma.c +++ b/coders/plasma.c @@ -96,7 +96,7 @@ static inline MagickBooleanType PlasmaPixel(Image *image, RandomInfo *magick_restrict random_info,const double x,const double y, ExceptionInfo *exception) { - register Quantum + Quantum *q; q=GetAuthenticPixels(image,(ssize_t) (x+0.5),(ssize_t) (y+0.5),1,1, @@ -124,13 +124,13 @@ static Image *ReadPlasmaImage(const ImageInfo *image_info, MagickStatusType status; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; - register size_t + size_t i; SegmentInfo diff --git a/coders/png.c b/coders/png.c index d1a4f3005..57df45e36 100644 --- a/coders/png.c +++ b/coders/png.c @@ -908,7 +908,7 @@ LosslessReduceDepthOK(Image *image,ExceptionInfo *exception) ssize_t y; - register ssize_t + ssize_t x; for (y=0; y < (ssize_t) image->rows; y++) @@ -1448,7 +1448,7 @@ static void mng_get_data(png_structp png_ptr,png_bytep data,png_size_t length) png_size_t check; - register ssize_t + ssize_t i; i=0; @@ -1599,7 +1599,7 @@ static void MngInfoDiscardObject(MngInfo *mng_info,int i) static MngInfo *MngInfoFreeStruct(MngInfo *mng_info) { - register ssize_t + ssize_t i; if (mng_info == (MngInfo *) NULL) @@ -1782,13 +1782,13 @@ Magick_png_read_raw_profile(png_struct *ping,Image *image, png_charp ep; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *dp; - register png_charp + png_charp sp; size_t @@ -2227,14 +2227,14 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, ssize_t y; - register unsigned char + unsigned char *p; - register ssize_t + ssize_t i, x; - register Quantum + Quantum *q; size_t @@ -3584,7 +3584,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, for (pass=0; pass < num_passes; pass++) { - register Quantum + Quantum *r; /* @@ -4467,17 +4467,17 @@ static Image *ReadOneJNGImage(MngInfo *mng_info, jng_alpha_filter_method, jng_alpha_interlace_method; - register const Quantum + const Quantum *s; - register ssize_t + ssize_t i, x; - register Quantum + Quantum *q; - register unsigned char + unsigned char *p; unsigned int @@ -5352,10 +5352,10 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info, mng_background_color; #endif - register unsigned char + unsigned char *p; - register ssize_t + ssize_t i; size_t @@ -6181,7 +6181,7 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info, else { - register ssize_t + ssize_t j; for (j=1; j < (ssize_t) length; j+=2) @@ -6927,11 +6927,11 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info, m, y; - register Quantum + Quantum *n, *q; - register ssize_t + ssize_t x; /* Allocate next image structure. */ @@ -7066,7 +7066,7 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info, for (i=0; i < m; i++, yy++) { - register Quantum + Quantum *pixels; assert(yy < (ssize_t) large_image->rows); @@ -7222,7 +7222,7 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info, for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *pixels; q=GetAuthenticPixels(image,0,y,image->columns,1,exception); @@ -8177,7 +8177,7 @@ Magick_png_write_raw_profile(const ImageInfo *image_info,png_struct *ping, allocated_length, description_length; - register ssize_t + ssize_t i; unsigned char @@ -8497,7 +8497,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, PNGErrorInfo error_info; - register ssize_t + ssize_t i, x; @@ -8803,7 +8803,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, /* Respect the -depth option */ if (image->depth < 4) { - register Quantum + Quantum *r; if (image->depth > 2) @@ -8997,10 +8997,10 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, semitransparent[260], transparent[260]; - register const Quantum + const Quantum *r; - register Quantum + Quantum *q; if (logging != MagickFalse) @@ -9788,7 +9788,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, else if (image_colors == 0 || image_colors > 256 || image->colormap == NULL) { - register const Quantum + const Quantum *q; for (y=0; y < (ssize_t) image->rows; y++) @@ -11428,7 +11428,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, QuantumType quantum_type; - register const Quantum + const Quantum *p; quantum_type=RedQuantum; @@ -11486,7 +11486,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, (ping_bit_depth >= MAGICKCORE_QUANTUM_DEPTH)) && (mng_info->IsPalette) && ping_have_color == MagickFalse) { - register const Quantum + const Quantum *p; for (pass=0; pass < num_passes; pass++) @@ -11542,7 +11542,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, else { - register const Quantum + const Quantum *p; for (pass=0; pass < num_passes; pass++) @@ -13191,7 +13191,7 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info, { if (jng_alpha_compression_method==0) { - register ssize_t + ssize_t i; size_t @@ -13447,7 +13447,7 @@ static MagickBooleanType WriteMNGImage(const ImageInfo *image_info, need_defi, use_global_plte; - register ssize_t + ssize_t i; unsigned char diff --git a/coders/pnm.c b/coders/pnm.c index 023413d00..88956cda5 100644 --- a/coders/pnm.c +++ b/coders/pnm.c @@ -155,7 +155,7 @@ static int PNMComment(Image *image,CommentInfo *comment_info, int c; - register char + char *p; /* @@ -233,7 +233,7 @@ static char *PNMString(Image *image,char *string,const size_t extent) int c; - register size_t + size_t i; for (i=0; i < (extent-1L); i++) @@ -372,7 +372,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) int c; - register char + char *p; /* @@ -503,10 +503,10 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) SetImageColorspace(image,GRAYColorspace,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); @@ -546,10 +546,10 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) SetImageColorspace(image,GRAYColorspace,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); @@ -586,10 +586,10 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) */ for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); @@ -647,7 +647,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType sync; - register Quantum + Quantum *magick_restrict q; ssize_t @@ -704,13 +704,13 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType sync; - register const unsigned char + const unsigned char *magick_restrict p; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; ssize_t @@ -812,13 +812,13 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType sync; - register const unsigned char + const unsigned char *magick_restrict p; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; ssize_t @@ -997,13 +997,13 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType sync; - register const unsigned char + const unsigned char *magick_restrict p; - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; ssize_t @@ -1322,7 +1322,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType sync; - register Quantum + Quantum *magick_restrict q; ssize_t @@ -1392,7 +1392,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType sync; - register Quantum + Quantum *magick_restrict q; ssize_t @@ -1648,7 +1648,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, QuantumType quantum_type; - register unsigned char + unsigned char *q; size_t @@ -1761,7 +1761,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, value=GetImageProperty(image,"comment",exception); if (value != (const char *) NULL) { - register const char + const char *p; /* @@ -1855,10 +1855,10 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, q=pixels; for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1913,10 +1913,10 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, q=pixels; for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1983,10 +1983,10 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, q=pixels; for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -2041,7 +2041,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, } case '4': { - register unsigned char + unsigned char *pixels; /* @@ -2057,7 +2057,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, pixels=GetQuantumPixels(quantum_info); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -2081,7 +2081,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, } case '5': { - register unsigned char + unsigned char *pixels; /* @@ -2100,10 +2100,10 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, extent=GetQuantumExtent(image,quantum_info,GrayQuantum); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -2199,7 +2199,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, } case '6': { - register unsigned char + unsigned char *pixels; /* @@ -2219,10 +2219,10 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, extent=GetQuantumExtent(image,quantum_info,quantum_type); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -2301,7 +2301,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, } case '7': { - register unsigned char + unsigned char *pixels; /* @@ -2316,10 +2316,10 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, pixels=GetQuantumPixels(quantum_info); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -2551,7 +2551,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, case 'F': case 'f': { - register unsigned char + unsigned char *pixels; (void) WriteBlobString(image,image->endian == LSBEndian ? "-1.0\n" : @@ -2567,7 +2567,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, pixels=GetQuantumPixels(quantum_info); for (y=(ssize_t) image->rows-1; y >= 0; y--) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -2590,7 +2590,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, case 'H': case 'h': { - register unsigned char + unsigned char *pixels; (void) WriteBlobString(image,image->endian == LSBEndian ? "-1.0\n" : @@ -2606,7 +2606,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, pixels=GetQuantumPixels(quantum_info); for (y=(ssize_t) image->rows-1; y >= 0; y--) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); diff --git a/coders/ps.c b/coders/ps.c index fdb4c26b4..7688ec9c1 100644 --- a/coders/ps.c +++ b/coders/ps.c @@ -179,7 +179,7 @@ static inline int ProfileInteger(MagickByteBuffer *buffer,short int *hex_digits) l, value; - register ssize_t + ssize_t i; l=0; @@ -235,10 +235,10 @@ static void ReadPSInfo(const ImageInfo *image_info,Image *image, MagickByteBuffer buffer; - register char + char *p; - register ssize_t + ssize_t i; SegmentInfo @@ -574,7 +574,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) RectangleInfo page; - register ssize_t + ssize_t i; ssize_t @@ -1029,7 +1029,7 @@ ModuleExport void UnregisterPSImage(void) static inline unsigned char *PopHexPixel(const char hex_digits[][3], const size_t pixel,unsigned char *pixels) { - register const char + const char *hex; hex=hex_digits[pixel]; @@ -1381,14 +1381,14 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image, media_info, page_info; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; - register unsigned char + unsigned char *q; SegmentInfo @@ -1592,7 +1592,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image, Quantum pixel; - register ssize_t + ssize_t x; ssize_t diff --git a/coders/ps2.c b/coders/ps2.c index 98cbc8741..242481a36 100644 --- a/coders/ps2.c +++ b/coders/ps2.c @@ -420,13 +420,13 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, media_info, page_info; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; - register ssize_t + ssize_t i; SegmentInfo @@ -769,7 +769,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, MemoryInfo *pixel_info; - register unsigned char + unsigned char *q; /* @@ -868,7 +868,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, MemoryInfo *pixel_info; - register unsigned char + unsigned char *q; /* @@ -1019,7 +1019,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, MemoryInfo *pixel_info; - register unsigned char + unsigned char *q; /* diff --git a/coders/ps3.c b/coders/ps3.c index 82b93fd60..f7a950fce 100644 --- a/coders/ps3.c +++ b/coders/ps3.c @@ -244,13 +244,13 @@ static MagickBooleanType SerializeImage(const ImageInfo *image_info, MagickBooleanType status; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; - register unsigned char + unsigned char *q; ssize_t @@ -309,13 +309,13 @@ static MagickBooleanType SerializeImageChannel(const ImageInfo *image_info, MagickBooleanType status; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; - register unsigned char + unsigned char *q; size_t @@ -386,13 +386,13 @@ static MagickBooleanType SerializeImageIndexes(const ImageInfo *image_info, MagickBooleanType status; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; - register unsigned char + unsigned char *q; ssize_t @@ -451,7 +451,7 @@ static MagickBooleanType WritePS3MaskImage(const ImageInfo *image_info, MemoryInfo *pixel_info; - register ssize_t + ssize_t i; size_t @@ -855,7 +855,7 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image, media_info, page_info; - register ssize_t + ssize_t i; SegmentInfo diff --git a/coders/psd.c b/coders/psd.c index 93e599f14..f757ae17c 100644 --- a/coders/psd.c +++ b/coders/psd.c @@ -325,10 +325,10 @@ static MagickBooleanType CorrectPSDAlphaBlend(const ImageInfo *image_info, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -344,7 +344,7 @@ static MagickBooleanType CorrectPSDAlphaBlend(const ImageInfo *image_info, double gamma; - register ssize_t + ssize_t i; gamma=QuantumScale*GetPixelAlpha(image, q); @@ -404,10 +404,10 @@ static MagickBooleanType ApplyPSDLayerOpacity(Image *image,Quantum opacity, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -476,13 +476,13 @@ static MagickBooleanType ApplyPSDOpacityMask(Image *image,const Image *mask, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register Quantum + Quantum *p; - register ssize_t + ssize_t x; if (status == MagickFalse) @@ -563,7 +563,7 @@ static ssize_t DecodePSDPixels(const size_t number_compact_pixels, int pixel; - register ssize_t + ssize_t i, j; @@ -1003,13 +1003,13 @@ static MagickBooleanType ReadPSDChannelPixels(Image *image, Quantum pixel; - register const unsigned char + const unsigned char *p; - register Quantum + Quantum *q; - register ssize_t + ssize_t x; size_t @@ -1216,7 +1216,7 @@ static MagickBooleanType ReadPSDChannelRLE(Image *image,const PSDInfo *psd_info, static void Unpredict8Bit(const Image *image,unsigned char *pixels, const size_t count,const size_t row_size) { - register unsigned char + unsigned char *p; size_t @@ -1241,7 +1241,7 @@ static void Unpredict8Bit(const Image *image,unsigned char *pixels, static void Unpredict16Bit(const Image *image,unsigned char *pixels, const size_t count,const size_t row_size) { - register unsigned char + unsigned char *p; size_t @@ -1267,11 +1267,11 @@ static void Unpredict16Bit(const Image *image,unsigned char *pixels, static void Unpredict32Bit(const Image *image,unsigned char *pixels, unsigned char *output_pixels,const size_t row_size) { - register unsigned char + unsigned char *p, *q; - register ssize_t + ssize_t y; size_t @@ -1320,7 +1320,7 @@ static MagickBooleanType ReadPSDChannelZip(Image *image,const size_t channels, MagickBooleanType status; - register unsigned char + unsigned char *p; size_t @@ -1328,7 +1328,7 @@ static MagickBooleanType ReadPSDChannelZip(Image *image,const size_t channels, packet_size, row_size; - register ssize_t + ssize_t y; unsigned char @@ -1642,7 +1642,7 @@ static MagickBooleanType CheckPSDChannels(const PSDInfo *psd_info, int channel_type; - register ssize_t + ssize_t i; if (layer_info->channels < psd_info->min_channels) @@ -1687,7 +1687,7 @@ static MagickBooleanType CheckPSDChannels(const PSDInfo *psd_info, static void AttachPSDLayers(Image *image,LayerInfo *layer_info, ssize_t number_layers) { - register ssize_t + ssize_t i; ssize_t @@ -1869,7 +1869,7 @@ static MagickBooleanType ReadPSDLayersInternal(Image *image, MagickBooleanType status; - register ssize_t + ssize_t i; ssize_t @@ -2241,7 +2241,7 @@ static MagickBooleanType ReadPSDMergedImage(const ImageInfo *image_info, PSDCompressionType compression; - register ssize_t + ssize_t i; if ((image_info->number_scenes != 0) && (image_info->scene != 0)) @@ -2320,7 +2320,7 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) PSDInfo psd_info; - register ssize_t + ssize_t i; size_t @@ -2787,11 +2787,11 @@ static size_t PSDPackbitsEncodeImage(Image *image,const size_t length, int count; - register ssize_t + ssize_t i, j; - register unsigned char + unsigned char *q; unsigned char @@ -2930,10 +2930,10 @@ static size_t WritePSDChannel(const PSDInfo *psd_info, QuantumInfo *quantum_info; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i; size_t @@ -3244,7 +3244,7 @@ static size_t WritePascalString(Image *image,const char *value,size_t padding) count, length; - register ssize_t + ssize_t i; /* @@ -3313,7 +3313,7 @@ static inline size_t WriteChannelSize(const PSDInfo *psd_info,Image *image, static void RemoveICCProfileFromResourceBlock(StringInfo *bim_profile) { - register const unsigned char + const unsigned char *p; size_t @@ -3336,7 +3336,7 @@ static void RemoveICCProfileFromResourceBlock(StringInfo *bim_profile) datum=GetStringInfoDatum(bim_profile); for (p=datum; (p >= datum) && (p < (datum+length-16)); ) { - register unsigned char + unsigned char *q; q=(unsigned char *) p; @@ -3368,7 +3368,7 @@ static void RemoveICCProfileFromResourceBlock(StringInfo *bim_profile) static void RemoveResolutionFromResourceBlock(StringInfo *bim_profile) { - register const unsigned char + const unsigned char *p; size_t @@ -3391,7 +3391,7 @@ static void RemoveResolutionFromResourceBlock(StringInfo *bim_profile) datum=GetStringInfoDatum(bim_profile); for (p=datum; (p >= datum) && (p < (datum+length-16)); ) { - register unsigned char + unsigned char *q; ssize_t @@ -3445,7 +3445,7 @@ static const StringInfo *GetAdditionalInformation(const ImageInfo *image_info, MagickBooleanType found; - register size_t + size_t i; size_t @@ -3544,7 +3544,7 @@ static MagickBooleanType WritePSDLayersInternal(Image *image, *layer_size_offsets, size_offset; - register ssize_t + ssize_t i; size_t @@ -3757,7 +3757,7 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info, PSDInfo psd_info; - register ssize_t + ssize_t i; size_t diff --git a/coders/pwp.c b/coders/pwp.c index d09fbbc67..6b82bbbf2 100644 --- a/coders/pwp.c +++ b/coders/pwp.c @@ -142,10 +142,10 @@ static Image *ReadPWPImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - register Image + Image *p; - register ssize_t + ssize_t i; size_t diff --git a/coders/raw.c b/coders/raw.c index cfef622bd..15fd18046 100644 --- a/coders/raw.c +++ b/coders/raw.c @@ -207,13 +207,13 @@ static Image *ReadRAWImage(const ImageInfo *image_info,ExceptionInfo *exception) } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -462,7 +462,7 @@ static MagickBooleanType WriteRAWImage(const ImageInfo *image_info,Image *image, MagickBooleanType status; - register const Quantum + const Quantum *p; size_t diff --git a/coders/rgb.c b/coders/rgb.c index 324d0481e..8df4a9d4c 100644 --- a/coders/rgb.c +++ b/coders/rgb.c @@ -118,7 +118,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) QuantumType quantum_type; - register ssize_t + ssize_t i; size_t @@ -231,13 +231,13 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -314,13 +314,13 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) { for (i=0; i < (ssize_t) (image->alpha_trait != UndefinedPixelTrait ? 4 : 3); i++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -410,13 +410,13 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -462,13 +462,13 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -514,13 +514,13 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -568,13 +568,13 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) { for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -659,13 +659,13 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -729,13 +729,13 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -799,13 +799,13 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -871,13 +871,13 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -1111,13 +1111,13 @@ static Image *ReadRGB565Image(const ImageInfo *image_info, } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -1390,7 +1390,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, */ for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1418,7 +1418,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, */ for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1472,7 +1472,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, */ for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1492,7 +1492,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, } for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1512,7 +1512,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, } for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1534,7 +1534,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, { for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1576,7 +1576,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, return(status); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1602,7 +1602,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, return(status); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1628,7 +1628,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, return(status); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -1656,7 +1656,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, return(status); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); diff --git a/coders/rgf.c b/coders/rgf.c index 61708a4f1..e804fb519 100644 --- a/coders/rgf.c +++ b/coders/rgf.c @@ -107,14 +107,14 @@ static Image *ReadRGFImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - register ssize_t + ssize_t i, x; - register Quantum + Quantum *q; - register unsigned char + unsigned char *p; ssize_t @@ -313,10 +313,10 @@ static MagickBooleanType WriteRGFImage(const ImageInfo *image_info,Image *image, MagickBooleanType status; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; size_t diff --git a/coders/rla.c b/coders/rla.c index d2a4f0f23..4f7a2fd6f 100644 --- a/coders/rla.c +++ b/coders/rla.c @@ -170,11 +170,11 @@ static Image *ReadRLAImage(const ImageInfo *image_info,ExceptionInfo *exception) offset, *scanlines; - register ssize_t + ssize_t i, x; - register Quantum + Quantum *q; ssize_t diff --git a/coders/rle.c b/coders/rle.c index 1d40860f8..d26ad2256 100644 --- a/coders/rle.c +++ b/coders/rle.c @@ -164,16 +164,16 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) Quantum index; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *p; size_t diff --git a/coders/scr.c b/coders/scr.c index 60b588630..caa4b5750 100644 --- a/coders/scr.c +++ b/coders/scr.c @@ -131,7 +131,7 @@ static Image *ReadSCRImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - register Quantum + Quantum *q; ssize_t diff --git a/coders/screenshot.c b/coders/screenshot.c index 166b6d2be..92e25a6f7 100644 --- a/coders/screenshot.c +++ b/coders/screenshot.c @@ -140,10 +140,10 @@ static Image *ReadSCREENSHOTImage(const ImageInfo *image_info, RectangleInfo geometry; - register Quantum + Quantum *q; - register ssize_t + ssize_t x; RGBQUAD diff --git a/coders/sct.c b/coders/sct.c index df6b0eaf3..01f5f8b7a 100644 --- a/coders/sct.c +++ b/coders/sct.c @@ -140,11 +140,11 @@ static Image *ReadSCTImage(const ImageInfo *image_info,ExceptionInfo *exception) Quantum pixel; - register ssize_t + ssize_t i, x; - register Quantum + Quantum *q; ssize_t diff --git a/coders/sfw.c b/coders/sfw.c index 7923fd721..979c5894c 100644 --- a/coders/sfw.c +++ b/coders/sfw.c @@ -123,7 +123,7 @@ static MagickBooleanType IsSFW(const unsigned char *magick,const size_t length) static unsigned char *SFWScan(const unsigned char *p,const unsigned char *q, const unsigned char *target,const size_t length) { - register ssize_t + ssize_t i; while ((p+length) < q) @@ -216,7 +216,7 @@ static Image *ReadSFWImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - register unsigned char + unsigned char *header, *data; diff --git a/coders/sgi.c b/coders/sgi.c index 4eabb5b79..a102e9565 100644 --- a/coders/sgi.c +++ b/coders/sgi.c @@ -168,7 +168,7 @@ static MagickBooleanType SGIDecode(const size_t bytes_per_pixel, ssize_t number_packets,unsigned char *packets,ssize_t number_pixels, unsigned char *pixels) { - register unsigned char + unsigned char *p, *q; @@ -268,14 +268,14 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) MemoryInfo *pixel_info; - register Quantum + Quantum *q; - register ssize_t + ssize_t i, x; - register unsigned char + unsigned char *p; SGIInfo @@ -852,7 +852,7 @@ static size_t SGIEncode(unsigned char *pixels,size_t length, short runlength; - register unsigned char + unsigned char *p, *q; @@ -923,14 +923,14 @@ static MagickBooleanType WriteSGIImage(const ImageInfo *image_info,Image *image, SGIInfo iris_info; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; - register unsigned char + unsigned char *q; size_t @@ -1043,7 +1043,7 @@ static MagickBooleanType WriteSGIImage(const ImageInfo *image_info,Image *image, if (image->depth <= 8) for (x=0; x < (ssize_t) image->columns; x++) { - register unsigned char + unsigned char *q; q=(unsigned char *) pixels; @@ -1057,7 +1057,7 @@ static MagickBooleanType WriteSGIImage(const ImageInfo *image_info,Image *image, else for (x=0; x < (ssize_t) image->columns; x++) { - register unsigned short + unsigned short *q; q=(unsigned short *) pixels; @@ -1090,7 +1090,7 @@ static MagickBooleanType WriteSGIImage(const ImageInfo *image_info,Image *image, if (image->depth <= 8) for (x=0; x < (ssize_t) iris_info.columns; x++) { - register unsigned char + unsigned char *q; q=(unsigned char *) pixels; @@ -1100,7 +1100,7 @@ static MagickBooleanType WriteSGIImage(const ImageInfo *image_info,Image *image, else for (x=0; x < (ssize_t) iris_info.columns; x++) { - register unsigned short + unsigned short *q; q=(unsigned short *) pixels; diff --git a/coders/sixel.c b/coders/sixel.c index 8424e4382..fe1376a21 100644 --- a/coders/sixel.c +++ b/coders/sixel.c @@ -992,13 +992,13 @@ static Image *ReadSIXELImage(const ImageInfo *image_info,ExceptionInfo *exceptio MagickBooleanType status; - register char + char *p; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; size_t @@ -1230,10 +1230,10 @@ static MagickBooleanType WriteSIXELImage(const ImageInfo *image_info, MagickBooleanType status; - register const Quantum + const Quantum *q; - register ssize_t + ssize_t i, x; diff --git a/coders/stegano.c b/coders/stegano.c index 0b87fec2b..a61344d00 100644 --- a/coders/stegano.c +++ b/coders/stegano.c @@ -111,10 +111,10 @@ static Image *ReadSTEGANOImage(const ImageInfo *image_info, PixelInfo pixel; - register Quantum + Quantum *q; - register ssize_t + ssize_t x; size_t diff --git a/coders/sun.c b/coders/sun.c index 3c554e188..06500e6f1 100644 --- a/coders/sun.c +++ b/coders/sun.c @@ -141,10 +141,10 @@ static MagickBooleanType IsSUN(const unsigned char *magick,const size_t length) static MagickBooleanType DecodeImage(const unsigned char *compressed_pixels, const size_t length,unsigned char *pixels,size_t extent) { - register const unsigned char + const unsigned char *p; - register unsigned char + unsigned char *q; ssize_t @@ -248,14 +248,14 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickSizeType number_pixels; - register Quantum + Quantum *q; - register ssize_t + ssize_t i, x; - register unsigned char + unsigned char *p; size_t @@ -787,10 +787,10 @@ static MagickBooleanType WriteSUNImage(const ImageInfo *image_info,Image *image, MagickSizeType number_pixels; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; @@ -892,7 +892,7 @@ static MagickBooleanType WriteSUNImage(const ImageInfo *image_info,Image *image, y=0; if (image->storage_class == DirectClass) { - register unsigned char + unsigned char *q; size_t @@ -946,7 +946,7 @@ static MagickBooleanType WriteSUNImage(const ImageInfo *image_info,Image *image, else if (SetImageMonochrome(image,exception) != MagickFalse) { - register unsigned char + unsigned char bit, byte; diff --git a/coders/svg.c b/coders/svg.c index d1d70518c..ed40d327b 100644 --- a/coders/svg.c +++ b/coders/svg.c @@ -652,7 +652,7 @@ static void SVGElementDeclaration(void *context,const xmlChar *name,int type, static void SVGStripString(const MagickBooleanType trim,char *message) { - register char + char *p, *q; @@ -716,11 +716,11 @@ static char **SVGKeyValuePairs(void *context,const int key_sentinel, char **tokens; - register const char + const char *p, *q; - register ssize_t + ssize_t i; size_t @@ -815,7 +815,7 @@ static void SVGProcessStyleElement(void *context,const xmlChar *name, char **tokens; - register ssize_t + ssize_t i; size_t @@ -1254,7 +1254,7 @@ static void SVGStartElement(void *context,const xmlChar *name, *p, *value; - register ssize_t + ssize_t i, j; @@ -2601,7 +2601,7 @@ static void SVGEndElement(void *context,const xmlChar *name) } if (LocaleCompare((const char *) name,"desc") == 0) { - register char + char *p; if (*svg_info->text == '\0') @@ -2787,7 +2787,7 @@ static void SVGEndElement(void *context,const xmlChar *name) **tokens, *value; - register ssize_t + ssize_t j; size_t @@ -2902,10 +2902,10 @@ static void SVGCharacters(void *context,const xmlChar *c,int length) char *text; - register char + char *p; - register ssize_t + ssize_t i; SVGInfo @@ -3265,7 +3265,7 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) MemoryInfo *pixel_info; - register unsigned char + unsigned char *p; RsvgDimensionData @@ -3278,7 +3278,7 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) GdkPixbuf *pixel_buffer; - register const guchar + const guchar *p; #endif @@ -3288,10 +3288,10 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) PixelInfo fill_color; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; RsvgHandle @@ -3948,10 +3948,10 @@ static MagickBooleanType TraceSVGImage(Image *image,ExceptionInfo *exception) ImageType type; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; @@ -4021,7 +4021,7 @@ static MagickBooleanType TraceSVGImage(Image *image,ExceptionInfo *exception) MagickBooleanType status; - register char + char *p; size_t @@ -4144,10 +4144,10 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, PrimitiveType primitive_type; - register ssize_t + ssize_t x; - register ssize_t + ssize_t i; size_t diff --git a/coders/tga.c b/coders/tga.c index 57afeff44..49c3dec65 100644 --- a/coders/tga.c +++ b/coders/tga.c @@ -156,10 +156,10 @@ static Image *ReadTGAImage(const ImageInfo *image_info,ExceptionInfo *exception) Quantum index; - register Quantum + Quantum *q; - register ssize_t + ssize_t i, x; @@ -734,16 +734,16 @@ static MagickBooleanType WriteTGAImage(const ImageInfo *image_info,Image *image, QuantumAny range; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *q; size_t diff --git a/coders/thumbnail.c b/coders/thumbnail.c index 1f7900aef..1998a9202 100644 --- a/coders/thumbnail.c +++ b/coders/thumbnail.c @@ -167,7 +167,7 @@ static MagickBooleanType WriteTHUMBNAILImage(const ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t i; size_t diff --git a/coders/tiff.c b/coders/tiff.c index 9fca736e3..e4e4eab76 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -567,10 +567,10 @@ static MagickBooleanType DecodeLabImage(Image *image,ExceptionInfo *exception) image_view=AcquireAuthenticCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception); @@ -838,7 +838,7 @@ static void TIFFGetEXIFProperties(TIFF *tiff,Image *image, char value[MagickPathExtent]; - register ssize_t + ssize_t i; tdir_t @@ -1066,7 +1066,7 @@ static TIFFMethodType GetJPEGMethod(Image* image,TIFF *tiff,uint16 photometric, position, offset; - register size_t + size_t i; TIFFMethodType @@ -1202,7 +1202,7 @@ static void TIFFReadPhotoshopLayers(const ImageInfo *image_info,Image *image, PSDInfo info; - register ssize_t + ssize_t i; if (GetImageListLength(image) != 1) @@ -1319,7 +1319,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, QuantumType quantum_type; - register ssize_t + ssize_t i; ssize_t @@ -1913,10 +1913,10 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, */ for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; unsigned char @@ -1956,7 +1956,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, } case ReadStripMethod: { - register unsigned char + unsigned char *p; size_t @@ -2012,7 +2012,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, rows_remaining=0; for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; q=GetAuthenticPixels(image,0,y,image->columns,1,exception); @@ -2053,7 +2053,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, } case ReadTileMethod: { - register unsigned char + unsigned char *p; size_t @@ -2105,7 +2105,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, } for (y=0; y < (ssize_t) image->rows; y+=rows) { - register ssize_t + ssize_t x; size_t @@ -2128,7 +2128,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, p=tile_pixels; for (row=0; row < rows_remaining; row++) { - register Quantum + Quantum *magick_restrict q; q=GetAuthenticPixels(image,x,y+row,columns_remaining,1, @@ -2162,7 +2162,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, MemoryInfo *generic_info = (MemoryInfo * ) NULL; - register uint32 + uint32 *p; uint32 @@ -2188,10 +2188,10 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, p=pixels+(image->columns*image->rows)-1; for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t + ssize_t x; - register Quantum + Quantum *magick_restrict q; q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); @@ -2319,7 +2319,7 @@ static void TIFFIgnoreTags(TIFF *tiff) Image *image; - register ssize_t + ssize_t i; size_t @@ -2436,7 +2436,7 @@ ModuleExport size_t RegisterTIFFImage(void) const char *p; - register ssize_t + ssize_t i; p=TIFFGetVersion(); @@ -2610,7 +2610,7 @@ static MagickBooleanType WriteGROUP4Image(const ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t i; ssize_t @@ -2904,10 +2904,10 @@ static MagickBooleanType EncodeLabImage(Image *image,ExceptionInfo *exception) image_view=AcquireAuthenticCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception); @@ -3019,10 +3019,10 @@ static int32 TIFFWritePixels(TIFF *tiff,TIFFInfo *tiff_info,ssize_t row, int32 status; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *p, *q; @@ -3359,7 +3359,7 @@ static void TIFFSetEXIFProperties(TIFF *tiff,Image *image, const char *value; - register ssize_t + ssize_t i; uint32 @@ -3449,7 +3449,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, QuantumType quantum_type; - register ssize_t + ssize_t i; size_t @@ -4102,7 +4102,7 @@ RestoreMSCWarning quantum_type=RGBAQuantum; for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -4131,7 +4131,7 @@ RestoreMSCWarning */ for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -4150,7 +4150,7 @@ RestoreMSCWarning } for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -4169,7 +4169,7 @@ RestoreMSCWarning } for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -4189,7 +4189,7 @@ RestoreMSCWarning if (image->alpha_trait != UndefinedPixelTrait) for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -4223,7 +4223,7 @@ RestoreMSCWarning (void) TransformImageColorspace(image,CMYKColorspace,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -4302,7 +4302,7 @@ RestoreMSCWarning quantum_type=GrayQuantum; for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; p=GetVirtualPixels(image,0,y,image->columns,1,exception); diff --git a/coders/tim.c b/coders/tim.c index 1bf343564..b1db7a2b4 100644 --- a/coders/tim.c +++ b/coders/tim.c @@ -109,16 +109,16 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *p; size_t diff --git a/coders/tim2.c b/coders/tim2.c index 64a7bf7b8..e76241e35 100644 --- a/coders/tim2.c +++ b/coders/tim2.c @@ -240,13 +240,13 @@ static MagickBooleanType ReadTIM2ImageData(const ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; - register unsigned char + unsigned char *p; size_t @@ -511,7 +511,7 @@ static MagickBooleanType ReadTIM2ImageData(const ImageInfo *image_info, CSM csm; - register ssize_t + ssize_t i; unsigned char diff --git a/coders/ttf.c b/coders/ttf.c index 271d04a8a..5ce1a45df 100644 --- a/coders/ttf.c +++ b/coders/ttf.c @@ -192,11 +192,11 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception) PixelInfo background_color; - register ssize_t + ssize_t i, x; - register Quantum + Quantum *q; ssize_t diff --git a/coders/txt.c b/coders/txt.c index e83281589..6a3522ab3 100644 --- a/coders/txt.c +++ b/coders/txt.c @@ -403,11 +403,11 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception) QuantumAny range; - register ssize_t + ssize_t i, x; - register Quantum + Quantum *q; ssize_t @@ -734,10 +734,10 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image, PixelInfo pixel; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; size_t diff --git a/coders/uil.c b/coders/uil.c index 6804fd222..0512cb564 100644 --- a/coders/uil.c +++ b/coders/uil.c @@ -179,10 +179,10 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image, PixelInfo pixel; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; @@ -259,7 +259,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image, colors=image->colors; if (transparent != MagickFalse) { - register Quantum + Quantum *q; i=0; diff --git a/coders/uyvy.c b/coders/uyvy.c index ce5269849..fbb1760b1 100644 --- a/coders/uyvy.c +++ b/coders/uyvy.c @@ -102,10 +102,10 @@ static Image *ReadUYVYImage(const ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; ssize_t @@ -299,10 +299,10 @@ static MagickBooleanType WriteUYVYImage(const ImageInfo *image_info, full, status; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; ssize_t diff --git a/coders/vicar.c b/coders/vicar.c index 313f4a8b7..492bcc957 100644 --- a/coders/vicar.c +++ b/coders/vicar.c @@ -165,7 +165,7 @@ static Image *ReadVICARImage(const ImageInfo *image_info, QuantumType quantum_type; - register Quantum + Quantum *q; size_t @@ -217,7 +217,7 @@ static Image *ReadVICARImage(const ImageInfo *image_info, } else { - register char + char *p; /* @@ -442,7 +442,7 @@ static MagickBooleanType WriteVICARImage(const ImageInfo *image_info, QuantumInfo *quantum_info; - register const Quantum + const Quantum *p; size_t diff --git a/coders/vid.c b/coders/vid.c index cab4dc28b..fcdd214da 100644 --- a/coders/vid.c +++ b/coders/vid.c @@ -126,7 +126,7 @@ static Image *ReadVIDImage(const ImageInfo *image_info,ExceptionInfo *exception) RectangleInfo geometry; - register ssize_t + ssize_t i; /* @@ -324,7 +324,7 @@ static MagickBooleanType WriteVIDImage(const ImageInfo *image_info,Image *image, MontageInfo *montage_info; - register Image + Image *p; /* diff --git a/coders/video.c b/coders/video.c index ed80f26a3..3a46ca82f 100644 --- a/coders/video.c +++ b/coders/video.c @@ -398,7 +398,7 @@ static MagickBooleanType CopyDelegateFile(const char *source, MagickBooleanType status; - register size_t + size_t i; size_t @@ -491,10 +491,10 @@ static MagickBooleanType WriteVIDEOImage(const ImageInfo *image_info, MagickBooleanType status; - register Image + Image *p; - register ssize_t + ssize_t i; size_t diff --git a/coders/viff.c b/coders/viff.c index 29f557f45..d4149e69d 100644 --- a/coders/viff.c +++ b/coders/viff.c @@ -223,16 +223,16 @@ static Image *ReadVIFFImage(const ImageInfo *image_info, MagickSizeType number_pixels; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *p; size_t @@ -950,16 +950,16 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info, MemoryInfo *pixel_info; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; - register ssize_t + ssize_t i; - register unsigned char + unsigned char *q; size_t @@ -1190,7 +1190,7 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info, else if (image->colors <= 2) { - register unsigned char + unsigned char bit, byte; diff --git a/coders/vips.c b/coders/vips.c index f3ff6dbf0..fb1af6027 100644 --- a/coders/vips.c +++ b/coders/vips.c @@ -309,10 +309,10 @@ static MagickBooleanType ReadVIPSPixelsNONE(Image *image, Quantum pixel; - register Quantum + Quantum *q; - register ssize_t + ssize_t x; ssize_t @@ -624,10 +624,10 @@ static MagickBooleanType WriteVIPSImage(const ImageInfo *image_info, MagickBooleanType status; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; ssize_t diff --git a/coders/wbmp.c b/coders/wbmp.c index 440b18187..49fede790 100644 --- a/coders/wbmp.c +++ b/coders/wbmp.c @@ -127,10 +127,10 @@ static Image *ReadWBMPImage(const ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; ssize_t @@ -324,7 +324,7 @@ static void WBMPWriteInteger(Image *image,const size_t value) flag, n; - register ssize_t + ssize_t i; unsigned char @@ -354,10 +354,10 @@ static MagickBooleanType WriteWBMPImage(const ImageInfo *image_info, MagickBooleanType status; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; ssize_t diff --git a/coders/webp.c b/coders/webp.c index b92003271..ef282089b 100644 --- a/coders/webp.c +++ b/coders/webp.c @@ -149,10 +149,10 @@ static MagickBooleanType IsWEBP(const unsigned char *magick,const size_t length) static inline uint32_t ReadWebPLSBWord( const unsigned char *magick_restrict data) { - register const unsigned char + const unsigned char *p; - register uint32_t + uint32_t value; p=data; @@ -240,7 +240,7 @@ static int ReadSingleWEBPImage(Image *image,const uint8_t *stream, int webp_status; - register unsigned char + unsigned char *p; size_t @@ -297,10 +297,10 @@ static int ReadSingleWEBPImage(Image *image,const uint8_t *stream, p=(unsigned char *) webp_image->u.RGBA.rgba; for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *q; - register ssize_t + ssize_t x; q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); @@ -801,7 +801,7 @@ static MagickBooleanType WriteSingleWEBPPicture(const ImageInfo *image_info, MagickBooleanType status; - register uint32_t + uint32_t *magick_restrict q; ssize_t @@ -836,10 +836,10 @@ static MagickBooleanType WriteSingleWEBPPicture(const ImageInfo *image_info, q=picture->argb; for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); diff --git a/coders/wpg.c b/coders/wpg.c index 860802114..58adb2b10 100644 --- a/coders/wpg.c +++ b/coders/wpg.c @@ -273,7 +273,7 @@ static MagickBooleanType InsertRow(Image *image,unsigned char *p,ssize_t y, Quantum index; - register Quantum + Quantum *q; ssize_t @@ -561,7 +561,7 @@ static int UnpackWPG2Raster(Image *image,int bpp,ExceptionInfo *exception) RunCount, XorMe = 0; - register ssize_t + ssize_t i; size_t diff --git a/coders/xbm.c b/coders/xbm.c index cbad3f04d..a3529d872 100644 --- a/coders/xbm.c +++ b/coders/xbm.c @@ -187,14 +187,14 @@ static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - register ssize_t + ssize_t i, x; - register Quantum + Quantum *q; - register unsigned char + unsigned char *p; short int @@ -510,10 +510,10 @@ static MagickBooleanType WriteXBMImage(const ImageInfo *image_info,Image *image, MagickBooleanType status; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; size_t diff --git a/coders/xc.c b/coders/xc.c index b81993e1e..5b5159c2e 100644 --- a/coders/xc.c +++ b/coders/xc.c @@ -100,10 +100,10 @@ static Image *ReadXCImage(const ImageInfo *image_info,ExceptionInfo *exception) PixelInfo pixel; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; ssize_t diff --git a/coders/xcf.c b/coders/xcf.c index ed49bb4b1..bee3bf942 100644 --- a/coders/xcf.c +++ b/coders/xcf.c @@ -381,7 +381,7 @@ static char *ReadBlobStringWithLongSize(Image *image,char *string,size_t max, MagickOffsetType offset; - register ssize_t + ssize_t i; size_t @@ -423,10 +423,10 @@ static MagickBooleanType load_tile(Image *image,Image *tile_image, ssize_t y; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; size_t @@ -513,7 +513,7 @@ static MagickBooleanType load_tile_rle(Image *image,Image *tile_image, alpha, data; - register Quantum + Quantum *q; size_t @@ -695,7 +695,7 @@ static MagickBooleanType load_level(Image *image,XCFDocInfo *inDocInfo, offset, offset2; - register ssize_t + ssize_t i; size_t @@ -1146,7 +1146,7 @@ static Image *ReadXCFImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickOffsetType offset; - register ssize_t + ssize_t i; size_t diff --git a/coders/xpm.c b/coders/xpm.c index 9aaa0dd90..a80a38044 100644 --- a/coders/xpm.c +++ b/coders/xpm.c @@ -159,7 +159,7 @@ static int CompareXPMColor(const void *target,const void *source) static ssize_t CopyXPMColor(char *destination,const char *source,size_t length) { - register const char + const char *p; p=source; @@ -190,14 +190,14 @@ static char *ParseXPMColor(char *color,MagickBooleanType search_start) { #define NumberTargets 6 - register char + char *p, *r; - register const char + const char *q; - register ssize_t + ssize_t i; static const char @@ -263,15 +263,15 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception) active, status; - register char + char *next, *p, *q; - register Quantum + Quantum *r; - register ssize_t + ssize_t x; size_t @@ -685,14 +685,14 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info, RectangleInfo geometry; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; - register Quantum + Quantum *q; size_t @@ -944,10 +944,10 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image, PixelInfo pixel; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; diff --git a/coders/xps.c b/coders/xps.c index ff20023e1..c97e02843 100644 --- a/coders/xps.c +++ b/coders/xps.c @@ -170,7 +170,7 @@ static Image *ReadXPSImage(const ImageInfo *image_info,ExceptionInfo *exception) RectangleInfo page; - register ssize_t + ssize_t i; unsigned long diff --git a/coders/xwd.c b/coders/xwd.c index fbb297ed8..08a03d831 100644 --- a/coders/xwd.c +++ b/coders/xwd.c @@ -171,16 +171,16 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception) Quantum index; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; - register ssize_t + ssize_t i; - register size_t + size_t pixel; size_t @@ -497,7 +497,7 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception) case DirectClass: default: { - register size_t + size_t color; size_t @@ -759,13 +759,13 @@ static MagickBooleanType WriteXWDImage(const ImageInfo *image_info,Image *image, MagickBooleanType status; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; - register unsigned char + unsigned char *q; size_t @@ -861,7 +861,7 @@ static MagickBooleanType WriteXWDImage(const ImageInfo *image_info,Image *image, (void) WriteBlob(image,1,(const unsigned char *) "\0"); if (image->storage_class == PseudoClass) { - register ssize_t + ssize_t i; XColor diff --git a/coders/yaml.c b/coders/yaml.c index 8570dc463..6b45fcddc 100644 --- a/coders/yaml.c +++ b/coders/yaml.c @@ -193,10 +193,10 @@ static void YAMLFormatLocaleFile(FILE *file,const char *format, char *escaped_json; - register char + char *q; - register const char + const char *p; size_t @@ -321,7 +321,7 @@ static ChannelStatistics *GetLocationStatistics(const Image *image, ChannelStatistics *channel_statistics; - register ssize_t + ssize_t i; ssize_t @@ -356,10 +356,10 @@ static ChannelStatistics *GetLocationStatistics(const Image *image, } for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *magick_restrict p; - register ssize_t + ssize_t x; p=GetVirtualPixels(image,0,y,image->columns,1,exception); @@ -367,7 +367,7 @@ static ChannelStatistics *GetLocationStatistics(const Image *image, break; for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t + ssize_t i; if (GetPixelReadMask(image,p) <= (QuantumRange/2)) @@ -575,7 +575,7 @@ static ssize_t PrintChannelLocations(FILE *file,const Image *image, n=0; for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *p; ssize_t @@ -622,7 +622,7 @@ static ssize_t PrintChannelMoments(FILE *file,const PixelChannel channel, const char *name,const MagickBooleanType separator, const ChannelMoments *channel_moments) { - register ssize_t + ssize_t i; ssize_t @@ -660,7 +660,7 @@ static ssize_t PrintChannelMoments(FILE *file,const PixelChannel channel, static ssize_t PrintChannelPerceptualHash(Image *image,FILE *file, const ChannelPerceptualHash *channel_phash) { - register ssize_t + ssize_t i; ssize_t @@ -675,7 +675,7 @@ static ssize_t PrintChannelPerceptualHash(Image *image,FILE *file, (void) FormatLocaleFile(file,"\n"); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - register ssize_t + ssize_t j; PixelChannel channel = GetPixelChannelChannel(image,i); @@ -685,7 +685,7 @@ static ssize_t PrintChannelPerceptualHash(Image *image,FILE *file, n=FormatLocaleFile(file," Channel%.20g: \n",(double) channel); for (j=0; j < MaximumNumberOfPerceptualHashes; j++) { - register ssize_t + ssize_t k; n+=FormatLocaleFile(file," PH%.20g: ",(double) j+1); @@ -752,7 +752,7 @@ static void EncodeIptcProfile(FILE *file,const StringInfo *profile) record, sentinel; - register ssize_t + ssize_t i, j, k; @@ -952,10 +952,10 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, MagickBooleanType ping; - register const Quantum + const Quantum *p; - register ssize_t + ssize_t i, x; @@ -1348,7 +1348,7 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, x=0; if (image->alpha_trait != UndefinedPixelTrait) { - register const Quantum + const Quantum *p; p=(const Quantum *) NULL; @@ -1379,7 +1379,7 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, } if (image->storage_class == PseudoClass) { - register PixelInfo + PixelInfo *magick_restrict p; (void) FormatLocaleFile(file," colormapEntries: %.20g\n", @@ -1496,7 +1496,7 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, ImageInfo *image_info; - register char + char *p, *q; diff --git a/coders/ycbcr.c b/coders/ycbcr.c index 85c49d574..fc70823c5 100644 --- a/coders/ycbcr.c +++ b/coders/ycbcr.c @@ -118,7 +118,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, QuantumType quantum_type; - register ssize_t + ssize_t i; size_t @@ -230,13 +230,13 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -311,13 +311,13 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, { for (i=0; i < (ssize_t) (image->alpha_trait != UndefinedPixelTrait ? 4 : 3); i++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -403,13 +403,13 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -456,13 +456,13 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -509,13 +509,13 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, } for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -564,13 +564,13 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, { for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -656,13 +656,13 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -727,13 +727,13 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -798,13 +798,13 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -871,13 +871,13 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, stream=ReadBlobStream(image,length,pixels,&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { - register const Quantum + const Quantum *magick_restrict p; - register Quantum + Quantum *magick_restrict q; - register ssize_t + ssize_t x; if (count != (ssize_t) length) @@ -1080,7 +1080,7 @@ static MagickBooleanType WriteYCBCRImage(const ImageInfo *image_info, QuantumType quantum_type; - register const Quantum + const Quantum *p; size_t diff --git a/coders/yuv.c b/coders/yuv.c index 0733f8deb..e93abcf56 100644 --- a/coders/yuv.c +++ b/coders/yuv.c @@ -109,13 +109,13 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - register ssize_t + ssize_t x; - register Quantum + Quantum *q; - register unsigned char + unsigned char *p; ssize_t @@ -234,7 +234,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception) } for (y=0; y < (ssize_t) image->rows; y++) { - register Quantum + Quantum *chroma_pixels; if (interlace == NoInterlace) @@ -451,7 +451,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception) } for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *chroma_pixels; q=GetAuthenticPixels(image,0,y,image->columns,1,exception); @@ -623,11 +623,11 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image, MagickOffsetType scene; - register const Quantum + const Quantum *p, *s; - register ssize_t + ssize_t x; size_t diff --git a/filters/analyze.c b/filters/analyze.c index 836a25742..39d6b2165 100644 --- a/filters/analyze.c +++ b/filters/analyze.c @@ -146,10 +146,10 @@ ModuleExport size_t analyzeImage(Image **images,const int argc, image_view=AcquireVirtualCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum + const Quantum *p; - register ssize_t + ssize_t x; if (status == MagickFalse) diff --git a/tests/validate.c b/tests/validate.c index c1b248394..8215c8320 100644 --- a/tests/validate.c +++ b/tests/validate.c @@ -1148,7 +1148,7 @@ static size_t ValidateCompareCommand(ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t i, j; @@ -1243,7 +1243,7 @@ static size_t ValidateCompositeCommand(ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t i, j; @@ -1335,7 +1335,7 @@ static size_t ValidateConvertCommand(ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t i, j; @@ -1426,7 +1426,7 @@ static size_t ValidateIdentifyCommand(ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t i, j; @@ -1538,7 +1538,7 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t i, j; @@ -1832,7 +1832,7 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t i, j; @@ -2049,7 +2049,7 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t i, j; @@ -2234,7 +2234,7 @@ static size_t ValidateMontageCommand(ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t i, j; @@ -2326,7 +2326,7 @@ static size_t ValidateStreamCommand(ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t i, j; @@ -2461,7 +2461,7 @@ int main(int argc,char **argv) memory_resource, map_resource; - register ssize_t + ssize_t i; TimerInfo diff --git a/tests/wandtest.c b/tests/wandtest.c index fc6c3c494..67d7f72c7 100644 --- a/tests/wandtest.c +++ b/tests/wandtest.c @@ -5185,7 +5185,7 @@ int main(int argc,char **argv) *border, **pixels; - register ssize_t + ssize_t i; unsigned char diff --git a/utilities/magick.c b/utilities/magick.c index 1dd58bb14..add71a10d 100644 --- a/utilities/magick.c +++ b/utilities/magick.c @@ -112,7 +112,7 @@ static int MagickMain(int argc,char **argv) MagickBooleanType status; - register ssize_t + ssize_t i; size_t @@ -188,7 +188,7 @@ int wmain(int argc,wchar_t *argv[]) int status; - register int + int i; utf8=NTArgvToUTF8(argc,argv); |