diff --git a/magick/cache.c b/magick/cache.c
index 0af1ded..c0d5237 100644
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -250,12 +250,12 @@
MagickExport NexusInfo **AcquirePixelCacheNexus(
const size_t number_threads)
{
- register ssize_t
- i;
-
NexusInfo
**nexus_info;
+ register ssize_t
+ i;
+
nexus_info=(NexusInfo **) AcquireAlignedMemory(number_threads,
sizeof(*nexus_info));
if (nexus_info == (NexusInfo **) NULL)
@@ -422,13 +422,13 @@
*restrict nexus_indexes,
*restrict indexes;
- register ssize_t
- i;
-
register PixelPacket
*restrict p,
*restrict q;
+ register ssize_t
+ i;
+
/*
Apply clip mask.
*/
@@ -584,15 +584,15 @@
MagickSizeType
number_pixels;
- register ssize_t
- i;
-
register const NexusInfo
*p;
register NexusInfo
*q;
+ register ssize_t
+ i;
+
status=MagickTrue;
for (i=0; i < (ssize_t) source->number_threads; i++)
{
@@ -878,12 +878,12 @@
MagickSizeType
length;
- register ssize_t
- y;
-
register PixelPacket
*restrict pixels;
+ register ssize_t
+ y;
+
size_t
columns,
rows;
@@ -1043,13 +1043,13 @@
MagickSizeType
length;
- register ssize_t
- y;
-
register PixelPacket
*restrict pixels,
*restrict q;
+ register ssize_t
+ y;
+
size_t
columns,
rows;
@@ -1155,13 +1155,13 @@
MagickSizeType
length;
- register ssize_t
- y;
-
register PixelPacket
*restrict p,
*restrict pixels;
+ register ssize_t
+ y;
+
size_t
columns,
rows;
@@ -1302,18 +1302,16 @@
static MagickBooleanType CloneMemoryToMemoryPixelCache(CacheInfo *clone_info,
CacheInfo *cache_info,ExceptionInfo *magick_unused(exception))
{
- register ssize_t
- y;
-
register PixelPacket
*restrict pixels,
*restrict source_pixels;
- size_t
- length;
+ register ssize_t
+ y;
size_t
columns,
+ length,
rows;
if (cache_info->debug != MagickFalse)
@@ -1818,8 +1816,8 @@
return(MagickTrue);
}
-MagickExport PixelPacket *GetAuthenticPixelCacheNexus(Image *image,const ssize_t x,
- const ssize_t y,const size_t columns,const size_t rows,
+MagickExport PixelPacket *GetAuthenticPixelCacheNexus(Image *image,
+ const ssize_t x,const ssize_t y,const size_t columns,const size_t rows,
NexusInfo *nexus_info,ExceptionInfo *exception)
{
CacheInfo
@@ -3281,13 +3279,13 @@
register IndexPacket
*restrict indexes;
+ register PixelPacket
+ *restrict q;
+
register ssize_t
u,
v;
- register PixelPacket
- *restrict q;
-
/*
Acquire pixels.
*/
@@ -3899,13 +3897,13 @@
*restrict nexus_indexes,
*restrict indexes;
- register ssize_t
- i;
-
register PixelPacket
*restrict p,
*restrict q;
+ register ssize_t
+ i;
+
/*
Apply clip mask.
*/
@@ -4057,11 +4055,9 @@
status;
size_t
+ columns,
packet_size;
- size_t
- columns;
-
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if ((image->columns == 0) || (image->rows == 0))
@@ -4289,12 +4285,12 @@
Image
clone_image;
- ssize_t
- page_size;
-
MagickBooleanType
status;
+ ssize_t
+ page_size;
+
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
@@ -4766,12 +4762,12 @@
length,
number_pixels;
- register ssize_t
- y;
-
register PixelPacket
*restrict q;
+ register ssize_t
+ y;
+
size_t
rows;