Fixed hiding of previous local variable.

diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index 0b0a79c02f3357bed2e715032e2535ad2868d724..093ee47f9ab4c117ed60c7228ad88c3d3b80a8c0 100644 (file)
--- a/MagickCore/identify.c
+++ b/MagickCore/identify.c
@@ -180,9 +180,6 @@ static ChannelStatistics *GetLocationStatistics(const Image *image,
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      register ssize_t
-        i;
-
       if (GetPixelReadMask(image,p) == 0)
         {
           p+=GetPixelChannels(image);
@@ -1020,9 +1017,6 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
       x=0;
       if (image->alpha_trait != UndefinedPixelTrait)
         {
-          register const Quantum
-            *p;
-
           p=(const Quantum *) NULL;
           for (y=0; y < (ssize_t) image->rows; y++)
           {
@@ -1078,7 +1072,6 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
       if (image->colors <= 1024)
         {
           char
-            color[MagickPathExtent],
             hex[MagickPathExtent],
             tuple[MagickPathExtent];
 
@@ -1086,13 +1079,13 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
             pixel;
 
           register PixelInfo
-            *magick_restrict p;
+            *magick_restrict c;
 
           GetPixelInfo(image,&pixel);
-          p=image->colormap;
+          c=image->colormap;
           for (i=0; i < (ssize_t) image->colors; i++)
           {
-            pixel=(*p);
+            pixel=(*c);
             (void) CopyMagickString(tuple,"(",MagickPathExtent);
             ConcatenateColorComponent(&pixel,RedPixelChannel,X11Compliance,
               tuple);
@@ -1120,7 +1113,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
             GetColorTuple(&pixel,MagickTrue,hex);
             (void) FormatLocaleFile(file,"  %8ld: %s %s %s\n",(long) i,tuple,
               hex,color);
-            p++;
+            c++;
           }
         }
     }
@@ -1221,7 +1214,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
         *image_info;
 
       register char
-        *p,
+        *d,
         *q;
 
       WarningHandler
@@ -1233,13 +1226,13 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
       image_info=AcquireImageInfo();
       (void) CloneString(&image_info->size,"64x64");
       (void) FormatLocaleFile(file,"  Directory:\n");
-      for (p=image->directory; *p != '\0'; p++)
+      for (d=image->directory; *d != '\0'; d++)
       {
-        q=p;
+        q=d;
         while ((*q != '\n') && (*q != '\0'))
           q++;
-        (void) CopyMagickString(image_info->filename,p,(size_t) (q-p+1));
-        p=q;
+        (void) CopyMagickString(image_info->filename,d,(size_t) (q-d+1));
+        d=q;
         (void) FormatLocaleFile(file,"    %s",image_info->filename);
         handler=SetWarningHandler((WarningHandler) NULL);
         tile=ReadImage(image_info,exception);

diff --git a/MagickCore/log.c b/MagickCore/log.c
index 4221b318cb2296256c579f63039b01692103cf08..39eba095cbfbf8160b07c4aab9e94659aeeb36a2 100644 (file)
--- a/MagickCore/log.c
+++ b/MagickCore/log.c
@@ -1091,15 +1091,15 @@ static char *TranslateEvent(const char *module,const char *function,
       case 'm':
       {
         register const char
-          *p;
+          *r;
 
-        for (p=module+strlen(module)-1; p > module; p--)
-          if (*p == *DirectorySeparator)
+        for (r=module+strlen(module)-1; r > module; r--)
+          if (*r == *DirectorySeparator)
             {
-              p++;
+              r++;
               break;
             }
-        q+=CopyMagickString(q,p,extent);
+        q+=CopyMagickString(q,r,extent);
         break;
       }
       case 'n':

diff --git a/MagickCore/magic.c b/MagickCore/magic.c
index 6d3d5199bd1dd58e41c95fc40805c156bb33ece0..ba861c00583be13bca10e34f708775e1913122ab 100644 (file)
--- a/MagickCore/magic.c
+++ b/MagickCore/magic.c
@@ -758,7 +758,6 @@ MagickExport MagickBooleanType ListMagicInfo(FILE *file,
   magic_info=GetMagicInfoList("*",&number_aliases,exception);
   if (magic_info == (const MagicInfo **) NULL)
     return(MagickFalse);
-  j=0;
   path=(const char *) NULL;
   for (i=0; i < (ssize_t) number_aliases; i++)
   {
@@ -781,9 +780,6 @@ MagickExport MagickBooleanType ListMagicInfo(FILE *file,
     (void) FormatLocaleFile(file,"%6ld ",(long) magic_info[i]->offset);
     if (magic_info[i]->target != (char *) NULL)
       {
-        register ssize_t
-          j;
-
         for (j=0; magic_info[i]->target[j] != '\0'; j++)
           if (isprint((int) ((unsigned char) magic_info[i]->target[j])) != 0)
             (void) FormatLocaleFile(file,"%c",magic_info[i]->target[j]);
@@ -1002,7 +998,7 @@ static MagickBooleanType LoadMagicCache(LinkedListInfo *cache,const char *xml,
               *p;
 
             register unsigned char
-              *q;
+              *r;
 
             size_t
               length;
@@ -1010,7 +1006,7 @@ static MagickBooleanType LoadMagicCache(LinkedListInfo *cache,const char *xml,
             length=strlen(token);
             magic_info->target=ConstantString(token);
             magic_info->magic=(unsigned char *) ConstantString(token);
-            q=magic_info->magic;
+            r=magic_info->magic;
             for (p=magic_info->target; *p != '\0'; )
             {
               if (*p == '\\')
@@ -1021,32 +1017,32 @@ static MagickBooleanType LoadMagicCache(LinkedListInfo *cache,const char *xml,
                       char
                         *end;
 
-                      *q++=(unsigned char) strtol(p,&end,8);
+                      *r++=(unsigned char) strtol(p,&end,8);
                       p+=(end-p);
                       magic_info->length++;
                       continue;
                     }
                   switch (*p)
                   {
-                    case 'b': *q='\b'; break;
-                    case 'f': *q='\f'; break;
-                    case 'n': *q='\n'; break;
-                    case 'r': *q='\r'; break;
-                    case 't': *q='\t'; break;
-                    case 'v': *q='\v'; break;
-                    case 'a': *q='a'; break;
-                    case '?': *q='\?'; break;
-                    default: *q=(unsigned char) (*p); break;
+                    case 'b': *r='\b'; break;
+                    case 'f': *r='\f'; break;
+                    case 'n': *r='\n'; break;
+                    case 'r': *r='\r'; break;
+                    case 't': *r='\t'; break;
+                    case 'v': *r='\v'; break;
+                    case 'a': *r='a'; break;
+                    case '?': *r='\?'; break;
+                    default: *r=(unsigned char) (*p); break;
                   }
                   p++;
-                  q++;
+                  r++;
                   magic_info->length++;
                   continue;
                 }
               else
                 if (LocaleNCompare(p,"&amp;",5) == 0)
                   (void) CopyMagickString(p+1,p+5,length-magic_info->length);
-              *q++=(unsigned char) (*p++);
+              *r++=(unsigned char) (*p++);
               magic_info->length++;
             }
             break;

diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index 51df4dc4747cf3b2280d065c64be0f1a3e79b907..e227f1e77a7171c7c51688afae8cbe0f0a4cc242 100644 (file)
--- a/MagickCore/montage.c
+++ b/MagickCore/montage.c
@@ -666,29 +666,28 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
       (void) TextureImage(montage,texture,exception);
     if (montage_info->title != (char *) NULL)
       {
-        char
-          geometry[MagickPathExtent];
-
         DrawInfo
-          *clone_info;
+          *draw_clone_info;
 
         TypeMetric
-          metrics;
+          tile_metrics;
 
         /*
           Annotate composite image with title.
         */
-        clone_info=CloneDrawInfo(image_info,draw_info);
-        clone_info->gravity=CenterGravity;
-        clone_info->pointsize*=2.0;
-        (void) GetTypeMetrics(image_list[0],clone_info,&metrics,exception);
-        (void) FormatLocaleString(geometry,MagickPathExtent,
+        draw_clone_info=CloneDrawInfo(image_info,draw_info);
+        draw_clone_info->gravity=CenterGravity;
+        draw_clone_info->pointsize*=2.0;
+        (void) GetTypeMetrics(image_list[0],draw_clone_info,&tile_metrics,
+          exception);
+        (void) FormatLocaleString(tile_geometry,MagickPathExtent,
           "%.20gx%.20g%+.20g%+.20g",(double) montage->columns,(double)
-          (metrics.ascent-metrics.descent),0.0,(double) extract_info.y+4);
-        (void) CloneString(&clone_info->geometry,geometry);
-        (void) CloneString(&clone_info->text,title);
-        (void) AnnotateImage(montage,clone_info,exception);
-        clone_info=DestroyDrawInfo(clone_info);
+          (tile_metrics.ascent-tile_metrics.descent),0.0,
+          (double) extract_info.y+4);
+        (void) CloneString(&draw_clone_info->geometry,tile_geometry);
+        (void) CloneString(&draw_clone_info->text,title);
+        (void) AnnotateImage(montage,draw_clone_info,exception);
+        draw_clone_info=DestroyDrawInfo(draw_clone_info);
       }
     (void) SetImageProgressMonitor(montage,progress_monitor,
       montage->client_data);
@@ -764,7 +763,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
       if ((montage_info->frame != (char *) NULL) && (bevel_width != 0))
         {
           FrameInfo
-            extract_info;
+            frame_clone;
 
           Image
             *frame_image;
@@ -772,14 +771,14 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
           /*
             Put an ornamental border around this tile.
           */
-          extract_info=frame_info;
-          extract_info.width=width+2*frame_info.width;
-          extract_info.height=height+2*frame_info.height;
+          frame_clone=frame_info;
+          frame_clone.width=width+2*frame_info.width;
+          frame_clone.height=height+2*frame_info.height;
           value=GetImageProperty(image,"label",exception);
           if (value != (const char *) NULL)
-            extract_info.height+=(size_t) ((metrics.ascent-metrics.descent+4)*
+            frame_clone.height+=(size_t) ((metrics.ascent-metrics.descent+4)*
               MultilineCensus(value));
-          frame_image=FrameImage(image,&extract_info,image->compose,exception);
+          frame_image=FrameImage(image,&frame_clone,image->compose,exception);
           if (frame_image != (Image *) NULL)
             {
               image=DestroyImage(image);
@@ -817,13 +816,10 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
           value=GetImageProperty(image,"label",exception);
           if (value != (const char *) NULL)
             {
-              char
-                geometry[MagickPathExtent];
-
               /*
                 Annotate composite tile with label.
               */
-              (void) FormatLocaleString(geometry,MagickPathExtent,
+              (void) FormatLocaleString(tile_geometry,MagickPathExtent,
                 "%.20gx%.20g%+.20g%+.20g",(double) ((montage_info->frame ?
                 image->columns : width)-2*border_width),(double)
                 (metrics.ascent-metrics.descent+4)*MultilineCensus(value),
@@ -831,7 +827,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
                 ((montage_info->frame ? y_offset+height+border_width+4 :
                 y_offset+extract_info.height+border_width+
                 (montage_info->shadow != MagickFalse ? 4 : 0))+bevel_width));
-              (void) CloneString(&draw_info->geometry,geometry);
+              (void) CloneString(&draw_info->geometry,tile_geometry);
               (void) CloneString(&draw_info->text,value);
               (void) AnnotateImage(montage,draw_info,exception);
             }
@@ -848,9 +844,6 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
         }
       if (images->progress_monitor != (MagickProgressMonitor) NULL)
         {
-          MagickBooleanType
-            proceed;
-
           proceed=SetImageProgress(image,MontageImageTag,tiles,total_tiles);
           if (proceed == MagickFalse)
             status=MagickFalse;

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 39d8f23f6a45ffadc9ef5f50208fabef0d74cd94..c66531b077bea4b5c23c0f4a5d065850ed67845d 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -855,23 +855,23 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
      component; \
  \
    size_t \
-     length; \
+     length1; \
  \
    unsigned char \
      *p1; \
  \
-   length=0; \
+   length1=0; \
    p1=p; \
    for (component=0; component < components; component++) \
    { \
-     length+=FormatLocaleString(buffer+length,MagickPathExtent-length, \
+     length1+=FormatLocaleString(buffer+length1,MagickPathExtent-length1, \
        format", ",arg); \
-     if (length >= (MagickPathExtent-1)) \
-       length=MagickPathExtent-1; \
+     if (length1 >= (MagickPathExtent-1)) \
+       length1=MagickPathExtent-1; \
      p1+=size; \
    } \
-   if (length > 1) \
-     buffer[length-2]='\0'; \
+   if (length1 > 1) \
+     buffer[length1-2]='\0'; \
    value=AcquireString(buffer); \
 }
 
@@ -881,23 +881,23 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
      component; \
  \
    size_t \
-     length; \
+     length1; \
  \
    unsigned char \
      *p1; \
  \
-   length=0; \
+   length1=0; \
    p1=p; \
    for (component=0; component < components; component++) \
    { \
-     length+=FormatLocaleString(buffer+length,MagickPathExtent-length, \
+     length1+=FormatLocaleString(buffer+length1,MagickPathExtent-length1, \
        format", ",(arg1),(arg2)); \
-     if (length >= (MagickPathExtent-1)) \
-       length=MagickPathExtent-1; \
+     if (length1 >= (MagickPathExtent-1)) \
+       length1=MagickPathExtent-1; \
      p1+=size; \
    } \
-   if (length > 1) \
-     buffer[length-2]='\0'; \
+   if (length1 > 1) \
+     buffer[length1-2]='\0'; \
    value=AcquireString(buffer); \
 }
 
@@ -1427,9 +1427,6 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
         p=q+8;
       else
         {
-          ssize_t
-            offset;
-
           /*
             The directory entry contains an offset.
           */
@@ -1518,9 +1515,6 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
                   sizeof(*value));
               if (value != (char *) NULL)
                 {
-                  register ssize_t
-                    i;
-
                   for (i=0; i < (ssize_t) number_bytes; i++)
                   {
                     value[i]='.';
@@ -1537,9 +1531,6 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
               char
                 *key;
 
-              register const char
-                *p;
-
               key=AcquireString(property);
               switch (all)
               {
@@ -1548,9 +1539,6 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
                   const char
                     *description;
 
-                  register ssize_t
-                    i;
-
                   description="unknown";
                   for (i=0; ; i++)
                   {
@@ -1587,11 +1575,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
                     (void) SubstituteString(&key,"exif:","exif:thumbnail:");
                 }
               }
-              p=(const char *) NULL;
-              if (image->properties != (void *) NULL)
-                p=(const char *) GetValueFromSplayTree((SplayTreeInfo *)
-                  image->properties,key);
-              if (p == (const char *) NULL)
+              if (GetImageProperty(image,key,exception) == (const char *) NULL)
                 (void) SetImageProperty((Image *) image,key,value,exception);
               value=DestroyString(value);
               key=DestroyString(key);
@@ -1601,9 +1585,6 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
         if ((tag_value == TAG_EXIF_OFFSET) ||
             (tag_value == TAG_INTEROP_OFFSET) || (tag_value == TAG_GPS_OFFSET))
           {
-            ssize_t
-              offset;
-
             offset=(ssize_t) ReadPropertySignedLong(endian,p);
             if (((size_t) offset < length) && (level < (MaxDirectoryStack-2)))
               {

diff --git a/MagickCore/random.c b/MagickCore/random.c
index 3e8e062efef2e2bbab93c5fdeb958ee63c6ee6fd..e6bc0bcadff70ed85e7d5b47eb1aaf481cb823b3 100644 (file)
--- a/MagickCore/random.c
+++ b/MagickCore/random.c
@@ -481,33 +481,29 @@ static StringInfo *GenerateEntropicChaos(RandomInfo *random_info)
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
   {
     double
-      seconds;
+      datum;
 
     LARGE_INTEGER
-      nanoseconds;
-
-    MagickBooleanType
-      status;
+      datum1;
 
     /*
       Not crytographically strong but better than nothing.
     */
-    seconds=NTElapsedTime()+NTUserTime();
-    SetStringInfoLength(chaos,sizeof(seconds));
-    SetStringInfoDatum(chaos,(unsigned char *) &seconds);
+    datum=NTElapsedTime()+NTUserTime();
+    SetStringInfoLength(chaos,sizeof(datum));
+    SetStringInfoDatum(chaos,(unsigned char *) &datum);
     ConcatenateStringInfo(entropy,chaos);
-    if (QueryPerformanceCounter(&nanoseconds) != 0)
+    if (QueryPerformanceCounter(&datum1) != 0)
       {
-        SetStringInfoLength(chaos,sizeof(nanoseconds));
-        SetStringInfoDatum(chaos,(unsigned char *) &nanoseconds);
+        SetStringInfoLength(chaos,sizeof(datum1));
+        SetStringInfoDatum(chaos,(unsigned char *) &datum1);
         ConcatenateStringInfo(entropy,chaos);
       }
     /*
       Our best hope for true entropy.
     */
     SetStringInfoLength(chaos,MaxEntropyExtent);
-    status=NTGatherRandomData(MaxEntropyExtent,GetStringInfoDatum(chaos));
-    (void) status;
+    (void) NTGatherRandomData(MaxEntropyExtent,GetStringInfoDatum(chaos));
     ConcatenateStringInfo(entropy,chaos);
   }
 #else

diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index d6b47db25c3fc35c2e336da1f6c40ee2449f962e..fdd34619d922f4036842316f0d2c11c9a138d764 100644 (file)
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -1943,14 +1943,14 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns,
   while (lqr_carver_scan_ext(carver,&x_offset,&y_offset,(void **) &packet) != 0)
   {
     register Quantum
-      *magick_restrict q;
+      *magick_restrict p;
 
     register ssize_t
       i;
 
-    q=QueueCacheViewAuthenticPixels(rescale_view,x_offset,y_offset,1,1,
+    p=QueueCacheViewAuthenticPixels(rescale_view,x_offset,y_offset,1,1,
       exception);
-    if (q == (Quantum *) NULL)
+    if (p == (Quantum *) NULL)
       break;
     for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
     {
@@ -1968,7 +1968,7 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns,
           (rescale_traits == UndefinedPixelTrait))
         continue;
       SetPixelChannel(rescale_image,channel,ClampToQuantum(QuantumRange*
-        packet[i]),q);
+        packet[i]),p);
     }
     if (SyncCacheViewAuthenticPixels(rescale_view,exception) == MagickFalse)
       break;
@@ -2981,7 +2981,7 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns,
     progress;
 
   register ssize_t
-    x;
+    x1;
 
   ssize_t
     *x_offset,
@@ -3040,8 +3040,8 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns,
       sample_image=DestroyImage(sample_image);
       ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
     }
-  for (x=0; x < (ssize_t) sample_image->columns; x++)
-    x_offset[x]=(ssize_t) ((((double) x+sample_offset.x)*image->columns)/
+  for (x1=0; x1 < (ssize_t) sample_image->columns; x1++)
+    x_offset[x1]=(ssize_t) ((((double) x1+sample_offset.x)*image->columns)/
       sample_image->columns);
   /*
     Sample each row.
@@ -3193,12 +3193,8 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
     proceed,
     status;
 
-  PixelChannel
-    channel;
-
   PixelTrait
-    scale_traits,
-    traits;
+    scale_traits;
 
   PointInfo
     scale,
@@ -3450,8 +3446,8 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
             }
           for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
           {
-            channel=GetPixelChannelChannel(image,i);
-            traits=GetPixelChannelTraits(image,channel);
+            PixelChannel channel=GetPixelChannelChannel(image,i);
+            PixelTrait traits=GetPixelChannelTraits(image,channel);
             scale_traits=GetPixelChannelTraits(scale_image,channel);
             if ((traits == UndefinedPixelTrait) ||
                 (scale_traits == UndefinedPixelTrait))

diff --git a/MagickCore/segment.c b/MagickCore/segment.c
index 11e7276fd5b62f6d69a27d62b5c866fed6ca9e48..7bb25dba344c4efe56d99f6cb3f5d7bd9f03dfda 100644 (file)
--- a/MagickCore/segment.c
+++ b/MagickCore/segment.c
@@ -539,7 +539,7 @@ static MagickBooleanType Classify(Image *image,short **extrema,
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     Cluster
-      *cluster;
+      *clust;
 
     register const PixelInfo
       *magick_restrict p;
@@ -561,29 +561,29 @@ static MagickBooleanType Classify(Image *image,short **extrema,
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       SetPixelIndex(image,0,q);
-      for (cluster=head; cluster != (Cluster *) NULL; cluster=cluster->next)
+      for (clust=head; clust != (Cluster *) NULL; clust=clust->next)
       {
         if (((ssize_t) ScaleQuantumToChar(GetPixelRed(image,q)) >=
-             (cluster->red.left-SafeMargin)) &&
+             (clust->red.left-SafeMargin)) &&
             ((ssize_t) ScaleQuantumToChar(GetPixelRed(image,q)) <=
-             (cluster->red.right+SafeMargin)) &&
+             (clust->red.right+SafeMargin)) &&
             ((ssize_t) ScaleQuantumToChar(GetPixelGreen(image,q)) >=
-             (cluster->green.left-SafeMargin)) &&
+             (clust->green.left-SafeMargin)) &&
             ((ssize_t) ScaleQuantumToChar(GetPixelGreen(image,q)) <=
-             (cluster->green.right+SafeMargin)) &&
+             (clust->green.right+SafeMargin)) &&
             ((ssize_t) ScaleQuantumToChar(GetPixelBlue(image,q)) >=
-             (cluster->blue.left-SafeMargin)) &&
+             (clust->blue.left-SafeMargin)) &&
             ((ssize_t) ScaleQuantumToChar(GetPixelBlue(image,q)) <=
-             (cluster->blue.right+SafeMargin)))
+             (clust->blue.right+SafeMargin)))
           {
             /*
               Classify this pixel.
             */
-            SetPixelIndex(image,(Quantum) cluster->id,q);
+            SetPixelIndex(image,(Quantum) clust->id,q);
             break;
           }
       }
-      if (cluster == (Cluster *) NULL)
+      if (clust == (Cluster *) NULL)
         {
           double
             distance_squared,

diff --git a/MagickCore/type.c b/MagickCore/type.c
index 52c8fa2b7157f6674c9afb08d9173fac47fdce8c..73ddcecf265bde3fd08a8042c62636f9a5ef8506 100644 (file)
--- a/MagickCore/type.c
+++ b/MagickCore/type.c
@@ -227,18 +227,18 @@ static SplayTreeInfo *AcquireTypeCache(const char *filename,
     if (font_path != (char *) NULL)
       {
         char
-          *option;
+          *xml;
 
         /*
           Search MAGICK_FONT_PATH.
         */
         (void) FormatLocaleString(path,MagickPathExtent,"%s%s%s",font_path,
           DirectorySeparator,filename);
-        option=FileToString(path,~0UL,exception);
-        if (option != (void *) NULL)
+        xml=FileToString(path,~0UL,exception);
+        if (xml != (void *) NULL)
           {
-            status&=LoadTypeCache(cache,option,path,0,exception);
-            option=DestroyString(option);
+            status&=LoadTypeCache(cache,xml,path,0,exception);
+            xml=DestroyString(xml);
           }
         font_path=DestroyString(font_path);
       }
@@ -1153,7 +1153,7 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *cache,const char *xml,
                 {
                   char
                     path[MagickPathExtent],
-                    *xml;
+                    *file_xml;
 
                   ExceptionInfo
                     *sans_exception;
@@ -1168,12 +1168,13 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *cache,const char *xml,
                   else
                     (void) ConcatenateMagickString(path,token,MagickPathExtent);
                   sans_exception=AcquireExceptionInfo();
-                  xml=FileToString(path,~0UL,sans_exception);
+                  file_xml=FileToString(path,~0UL,sans_exception);
                   sans_exception=DestroyExceptionInfo(sans_exception);
-                  if (xml != (char *) NULL)
+                  if (file_xml != (char *) NULL)
                     {
-                      status&=LoadTypeCache(cache,xml,path,depth+1,exception);
-                      xml=(char *) RelinquishMagickMemory(xml);
+                      status&=LoadTypeCache(cache,file_xml,path,depth+1,
+                        exception);
+                      file_xml=(char *) RelinquishMagickMemory(file_xml);
                     }
                 }
             }

diff --git a/MagickCore/utility.c b/MagickCore/utility.c
index 360b085a4c8cfbd991511e4a962e26d5bd6a49a3..2eaa5503da6e944ccc89da8f95b32a06b3a91377 100644 (file)
--- a/MagickCore/utility.c
+++ b/MagickCore/utility.c
@@ -899,22 +899,24 @@ MagickExport MagickBooleanType ExpandFilenames(int *number_arguments,
       if (IsPathDirectory(filename) <= 0)
         {
           char
-            path[MagickPathExtent];
+            file_path[MagickPathExtent];
 
-          *path='\0';
+          *file_path='\0';
           if (*magick != '\0')
             {
-              (void) ConcatenateMagickString(path,magick,MagickPathExtent);
-              (void) ConcatenateMagickString(path,":",MagickPathExtent);
+              (void) ConcatenateMagickString(file_path,magick,
+                MagickPathExtent);
+              (void) ConcatenateMagickString(file_path,":",MagickPathExtent);
             }
-          (void) ConcatenateMagickString(path,filename,MagickPathExtent);
+          (void) ConcatenateMagickString(file_path,filename,MagickPathExtent);
           if (*subimage != '\0')
             {
-              (void) ConcatenateMagickString(path,"[",MagickPathExtent);
-              (void) ConcatenateMagickString(path,subimage,MagickPathExtent);
-              (void) ConcatenateMagickString(path,"]",MagickPathExtent);
+              (void) ConcatenateMagickString(file_path,"[",MagickPathExtent);
+              (void) ConcatenateMagickString(file_path,subimage,
+                MagickPathExtent);
+              (void) ConcatenateMagickString(file_path,"]",MagickPathExtent);
             }
-          if (strlen(path) >= (MagickPathExtent-1))
+          if (strlen(file_path) >= (MagickPathExtent-1))
             ThrowFatalException(OptionFatalError,"FilenameTruncated");
           if (destroy != MagickFalse)
             {
@@ -922,7 +924,7 @@ MagickExport MagickBooleanType ExpandFilenames(int *number_arguments,
               vector[count]=DestroyString(vector[count]);
               destroy=MagickFalse;
             }
-          vector[count++]=ConstantString(path);
+          vector[count++]=ConstantString(file_path);
         }
     }
     filelist=(char **) RelinquishMagickMemory(filelist);

diff --git a/MagickCore/version.c b/MagickCore/version.c
index 227fc30f77f67d17b3792a97de24dff1b11f846b..13639c852ee75be31d53b2f2763963346d1204b5 100644 (file)
--- a/MagickCore/version.c
+++ b/MagickCore/version.c
@@ -478,20 +478,20 @@ static unsigned int CRC32(const unsigned char *message,const size_t length)
   if (crc_initial == MagickFalse)
     {
       register unsigned int
-        i;
+        j;
 
       unsigned int
         alpha;
 
-      for (i=0; i < 256; i++)
+      for (j=0; j < 256; j++)
       {
         register ssize_t
-          j;
+          k;
 
-        alpha=i;
-        for (j=0; j < 8; j++)
+        alpha=j;
+        for (k=0; k < 8; k++)
           alpha=(alpha & 0x01) ? (0xEDB88320 ^ (alpha >> 1)) : (alpha >> 1);
-        crc_xor[i]=alpha;
+        crc_xor[j]=alpha;
       }
       crc_initial=MagickTrue;
     }

diff --git a/coders/dib.c b/coders/dib.c
index fe7bf5da9dc675b359544276b5491324d0d42781..111b883ca7763c93afe99c80a242e115d15dfb68 100644 (file)
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -600,7 +600,6 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
   if (image->storage_class == PseudoClass)
     {
       size_t
-        length,
         packet_size;
 
       unsigned char

diff --git a/coders/mat.c b/coders/mat.c
index b8e013fdb1daad0a3116e76a9faf45b0e0bc8d24..c9371d888709df843c3f35b14954fb0d70762cb3 100644 (file)
--- a/coders/mat.c
+++ b/coders/mat.c
@@ -732,9 +732,6 @@ static Image *ReadMATImageV4(const ImageInfo *image_info,Image *image,
     pixels=(unsigned char *) GetQuantumPixels(quantum_info);
     for (y=0; y < (ssize_t) image->rows; y++)
     {
-      int
-        status;
-
       register Quantum
         *magick_restrict q;
 

diff --git a/coders/wpg.c b/coders/wpg.c
index 020fb2b97b4b96b61c17ee43f4a6fabb78a68fe2..ae43f9cc364dcfdeae2b91dd17f872ad50dad965 100644 (file)
--- a/coders/wpg.c
+++ b/coders/wpg.c
@@ -1322,10 +1322,6 @@ static Image *ReadWPGImage(const ImageInfo *image_info,
                 break;
               if ((image->colors == 0) && (bpp != 24))
                 {
-                  size_t
-                    one;
-
-                  one=1;
                   image->colors=one << bpp;
                   if (!AcquireImageColormap(image,image->colors,exception))
                     goto NoMemory;