From: dirk <dirk@git.imagemagick.org>
Date: Wed, 25 Nov 2015 22:44:01 +0000 (+0100)
Subject: Fixed various warnings reported by Visual Studio 2015.
X-Git-Tag: 7.0.1-0~464
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db6b52c4ffaab982c1647175db24d212f4b90a4d;p=imagemagick

Fixed various warnings reported by Visual Studio 2015.
---

diff --git a/MagickCore/token.c b/MagickCore/token.c
index 9c8dc1bd8..5a690c351 100644
--- a/MagickCore/token.c
+++ b/MagickCore/token.c
@@ -468,9 +468,6 @@ MagickExport MagickBooleanType GlobExpression(const char *expression,
       }
       case '{':
       {
-        register const char
-          *p;
-
         pattern+=GetUTFOctets(pattern);
         while ((GetUTFCode(pattern) != '}') && (GetUTFCode(pattern) != 0))
         {
diff --git a/coders/pdf.c b/coders/pdf.c
index b0e510f9d..778a72849 100644
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -550,9 +550,6 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception)
           property[MagickPathExtent],
           *value;
 
-        register ssize_t
-          i;
-
         /*
           Note spot names.
         */
@@ -645,13 +642,11 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception)
   if (option != (char *) NULL)
   {
     char
-      *geometry;
-
-    MagickStatusType
-      flags;
+      *page_geometry;
 
-    geometry=GetPageGeometry(option);
-    flags=ParseMetaGeometry(geometry,&page.x,&page.y,&page.width,&page.height);
+    page_geometry=GetPageGeometry(option);
+    flags=ParseMetaGeometry(page_geometry,&page.x,&page.y,&page.width,
+      &page.height);
     if (flags == NoValue)
       {
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
@@ -663,7 +658,7 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception)
       -0.5);
     page.height=(size_t) ceil((double) (page.height*image->resolution.y/
       delta.y) -0.5);
-    geometry=DestroyString(geometry);
+    page_geometry=DestroyString(page_geometry);
     fitPage=MagickTrue;
   }
   (void) CloseBlob(image);
@@ -810,9 +805,6 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception)
       Image
         *clone_image;
 
-      register ssize_t
-        i;
-
       /*
         Add place holder images to meet the subimage specification requirement.
       */
@@ -1237,9 +1229,6 @@ RestoreMSCWarning
         timestamp[MagickPathExtent],
         xmp_profile[MagickPathExtent];
 
-      size_t
-        version;
-
       /*
         Write XMP object.
       */
diff --git a/coders/ps.c b/coders/ps.c
index 46e9ca100..4dbfd536c 100644
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -643,7 +643,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
     if (LocaleNCompare(PhotoshopProfile,command,strlen(PhotoshopProfile)) == 0)
       {
         unsigned char
-          *p;
+          *q;
 
         /*
           Read Photoshop profile.
@@ -655,9 +655,9 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
         profile=BlobToStringInfo((const void *) NULL,length);
         if (profile != (StringInfo *) NULL)
           {
-            p=GetStringInfoDatum(profile);
+            q=GetStringInfoDatum(profile);
             for (i=0; i < (ssize_t) length; i++)
-              *p++=(unsigned char) ProfileInteger(image,hex_digits);
+              *q++=(unsigned char) ProfileInteger(image,hex_digits);
             (void) SetImageProfile(image,"8bim",profile,exception);
             profile=DestroyStringInfo(profile);
           }
@@ -665,9 +665,6 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
       }
     if (LocaleNCompare(BeginXMPPacket,command,strlen(BeginXMPPacket)) == 0)
       {
-        register size_t
-          i;
-
         /*
           Read XMP profile.
         */
@@ -717,17 +714,17 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
           *value;
 
         register char
-          *p;
+          *q;
 
         /*
           Note spot names.
         */
         (void) FormatLocaleString(property,MagickPathExtent,"ps:SpotColor-%.20g",
           (double) (spotcolor++));
-        for (p=command; *p != '\0'; p++)
-          if (isspace((int) (unsigned char) *p) != 0)
+        for (q=command; *q != '\0'; q++)
+          if (isspace((int) (unsigned char) *q) != 0)
             break;
-        value=AcquireString(p);
+        value=AcquireString(q);
         (void) SubstituteString(&value,"(","");
         (void) SubstituteString(&value,")","");
         (void) StripString(value);
@@ -801,13 +798,11 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
   if (option != (char *) NULL)
   {
     char
-      *geometry;
-
-    MagickStatusType
-      flags;
+      *page_geometry;
 
-    geometry=GetPageGeometry(option);
-    flags=ParseMetaGeometry(geometry,&page.x,&page.y,&page.width,&page.height);
+    page_geometry=GetPageGeometry(option);
+    flags=ParseMetaGeometry(page_geometry,&page.x,&page.y,&page.width,
+      &page.height);
     if (flags == NoValue)
       {
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
@@ -819,7 +814,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
       -0.5);
     page.height=(size_t) ceil((double) (page.height*image->resolution.y/
       delta.y) -0.5);
-    geometry=DestroyString(geometry);
+    page_geometry=DestroyString(page_geometry);
     fitPage=MagickTrue;
   }
   (void) CloseBlob(image);
@@ -973,9 +968,6 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
       Image
         *clone_image;
 
-      register ssize_t
-        i;
-
       /*
         Add place holder images to meet the subimage specification requirement.
       */