Fixed various warnings reported by Visual Studio 2015

diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index a3978253c4677ca583e163b8ceb1a0a45a2a9c0b..2242cd6865c0512122a590f6bd449daff1dd3c9e 100644 (file)
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -69,6 +69,7 @@ namespace MagickCore
 //
 #    if defined(_VISUALC_)
 #      define MagickDLLExplicitTemplate
+#      pragma warning( disable: 4275 )
 #      pragma warning( disable: 4273 )  /* Disable the stupid dll linkage warnings */
 #      pragma warning( disable: 4251 )
 #    endif

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index d14439e0188aabb059156408efe245cef60cf26e..36549073cd8751ac333ab9fe5581f87fcb2fc350 100644 (file)
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -1236,12 +1236,12 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
         geometry_info;
 
       MagickStatusType
-        flags;
+        geometry_flags;
 
-      flags=ParseGeometry(draw_info->density,&geometry_info);
+      geometry_flags=ParseGeometry(draw_info->density,&geometry_info);
       resolution.x=geometry_info.rho;
       resolution.y=geometry_info.sigma;
-      if ((flags & SigmaValue) == 0)
+      if ((geometry_flags & SigmaValue) == 0)
         resolution.y=resolution.x;
     }
   ft_status=FT_Set_Char_Size(face,(FT_F26Dot6) (64.0*draw_info->pointsize),
@@ -1410,13 +1410,13 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
           *image_view;
 
         register unsigned char
-          *p;
+          *r;
 
         /*
           Rasterize the glyph.
         */
         image_view=AcquireAuthenticCacheView(image,exception);
-        p=bitmap->bitmap.buffer;
+        r=bitmap->bitmap.buffer;
         for (y=0; y < (ssize_t) bitmap->bitmap.rows; y++)
         {
           MagickBooleanType
@@ -1467,9 +1467,9 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
                 continue;
               }
             if (bitmap->bitmap.pixel_mode != ft_pixel_mode_mono)
-              fill_opacity=(double) (p[n])/(bitmap->bitmap.num_grays-1);
+              fill_opacity=(double) (r[n])/(bitmap->bitmap.num_grays-1);
             else
-              fill_opacity=((p[(x >> 3)+y*bitmap->bitmap.pitch] &
+              fill_opacity=((r[(x >> 3)+y*bitmap->bitmap.pitch] &
                 (1 << (~x & 0x07)))) == 0 ? 0.0 : 1.0;
             if (draw_info->text_antialias == MagickFalse)
               fill_opacity=fill_opacity >= 0.5 ? 1.0 : 0.0;

diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c
index de44234422ebfd0e2f65858a57e1e27b0917b091..0f26c98a96b50608d887a6a41d34e89e4f96bbd0 100644 (file)
--- a/MagickCore/attribute.c
+++ b/MagickCore/attribute.c
@@ -139,7 +139,7 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image,
     bounds;
 
   register const Quantum
-    *p;
+    *restrict p;
 
   ssize_t
     y;
@@ -185,9 +185,6 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image,
     RectangleInfo
       bounding_box;
 
-    register const Quantum
-      *restrict p;
-
     register ssize_t
       x;
 

diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index 18334867e9146ef23129e8fba29aebdad8a21fe8..6d0329cfc722fb1c0f85b71be1a2db6d06af7b86 100755 (executable)
--- a/MagickCore/blob.c
+++ b/MagickCore/blob.c
@@ -2467,11 +2467,11 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info,
   if (LocaleNCompare(filename,"fd:",3) == 0)
     {
       char
-        mode[MagickPathExtent];
+        fileMode[MagickPathExtent];
 
-      *mode=(*type);
-      mode[1]='\0';
-      image->blob->file_info.file=fdopen(StringToLong(filename+3),mode);
+      *fileMode =(*type);
+      fileMode[1]='\0';
+      image->blob->file_info.file=fdopen(StringToLong(filename+3),fileMode);
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__OS2__)
       if (strchr(type,'b') != (char *) NULL)
         setmode(_fileno(image->blob->file_info.file),_O_BINARY);
@@ -2484,7 +2484,7 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info,
   if (*filename == '|')
     {
       char
-        mode[MagickPathExtent];
+        fileMode[MagickPathExtent];
 
       /*
         Pipe image to or from a system command.
@@ -2493,9 +2493,9 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info,
       if (*type == 'w')
         (void) signal(SIGPIPE,SIG_IGN);
 #endif
-      *mode=(*type);
-      mode[1]='\0';
-      image->blob->file_info.file=(FILE *) popen_utf8(filename+1,mode);
+      *fileMode =(*type);
+      fileMode[1]='\0';
+      image->blob->file_info.file=(FILE *) popen_utf8(filename+1, fileMode);
       if (image->blob->file_info.file == (FILE *) NULL)
         {
           ThrowFileException(exception,BlobError,"UnableToOpenBlob",filename);

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 1d30c0847437840b05126fb1c2edd807f382a4aa..b1db87ab6f29c2a57b14fd17c3af2e52204942af 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -3696,14 +3696,10 @@ MagickExport MagickBooleanType PersistPixelCache(Image *image,
           ((cache_info->type == DiskCache) || (cache_info->type == MapCache)) &&
           (cache_info->reference_count == 1))
         {
-          int
-            status;
-
           /*
             Usurp existing persistent pixel cache.
           */
-          status=rename_utf8(cache_info->cache_filename,filename);
-          if (status == 0)
+          if (rename_utf8(cache_info->cache_filename, filename) == 0)
             {
               (void) CopyMagickString(cache_info->cache_filename,filename,
                 MagickPathExtent);

diff --git a/MagickCore/coder.c b/MagickCore/coder.c
index 3b94c06c4cfa3161367e4f30337d76c028105e09..8a09bc8d7c33cbc6f015770fa79a6e1329edea75 100644 (file)
--- a/MagickCore/coder.c
+++ b/MagickCore/coder.c
@@ -875,7 +875,7 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache,
                 {
                   char
                     path[MagickPathExtent],
-                    *xml;
+                    *fileXml;
 
                   GetPathComponent(filename,HeadPath,path);
                   if (*path != '\0')
@@ -885,12 +885,12 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache,
                     (void) CopyMagickString(path,token,MagickPathExtent);
                   else
                     (void) ConcatenateMagickString(path,token,MagickPathExtent);
-                  xml=FileToXML(path,~0UL);
-                  if (xml != (char *) NULL)
+                  fileXml=FileToXML(path,~0UL);
+                  if (fileXml != (char *) NULL)
                     {
-                      status&=LoadCoderCache(coder_cache,xml,path,depth+1,
+                      status&=LoadCoderCache(coder_cache,fileXml,path,depth+1,
                         exception);
-                      xml=(char *) RelinquishMagickMemory(xml);
+                      fileXml=(char *) RelinquishMagickMemory(fileXml);
                     }
                 }
             }

diff --git a/MagickCore/color.c b/MagickCore/color.c
index a72a864b881b86d16c0df64151ba396d96121e5d..7ee846edc9185fcf525db6c2ae71a7aad4c81344 100644 (file)
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -2049,7 +2049,7 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache,
                 {
                   char
                     path[MagickPathExtent],
-                    *xml;
+                    *fileXml;
 
                   GetPathComponent(filename,HeadPath,path);
                   if (*path != '\0')
@@ -2059,12 +2059,12 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache,
                     (void) CopyMagickString(path,token,MagickPathExtent);
                   else
                     (void) ConcatenateMagickString(path,token,MagickPathExtent);
-                  xml=FileToXML(path,~0UL);
-                  if (xml != (char *) NULL)
+                  fileXml=FileToXML(path,~0UL);
+                  if (fileXml != (char *) NULL)
                     {
-                      status&=LoadColorCache(color_cache,xml,path,depth+1,
+                      status&=LoadColorCache(color_cache,fileXml,path,depth+1,
                         exception);
-                      xml=(char *) RelinquishMagickMemory(xml);
+                      fileXml=(char *) RelinquishMagickMemory(fileXml);
                     }
                 }
             }
@@ -2385,14 +2385,14 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name,
             *colorname;
 
           ColorspaceType
-            colorspace;
+            colorspaceType;
 
-          colorspace=color->colorspace;
+          colorspaceType=color->colorspace;
           colorname=AcquireString(name+i+1);
           (void) SubstituteString(&colorname,")","");
           (void) QueryColorCompliance(colorname,AllCompliance,color,exception);
           colorname=DestroyString(colorname);
-          color->colorspace=colorspace;
+          color->colorspace=colorspaceType;
         }
       else
         {

diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index 00eacd21d4c61e95330474b754bf91f68c605947..e27b5ef2e63290e8e846ca30da9a7fd799644ed0 100644 (file)
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -397,7 +397,7 @@ static MagickBooleanType GetAbsoluteDistortion(const Image *image,
       *restrict q;
 
     register ssize_t
-      i,
+      j,
       x;
 
     if (status == MagickFalse)
@@ -459,8 +459,8 @@ static MagickBooleanType GetAbsoluteDistortion(const Image *image,
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
     #pragma omp critical (MagickCore_GetAbsoluteError)
 #endif
-    for (i=0; i <= MaxPixelChannels; i++)
-      distortion[i]+=channel_distortion[i];
+    for (j=0; j <= MaxPixelChannels; j++)
+      distortion[j]+=channel_distortion[j];
   }
   reconstruct_view=DestroyCacheView(reconstruct_view);
   image_view=DestroyCacheView(image_view);
@@ -478,7 +478,7 @@ static MagickBooleanType GetFuzzDistortion(const Image *image,
     status;
 
   register ssize_t
-    i;
+    j;
 
   size_t
     columns,
@@ -506,7 +506,6 @@ static MagickBooleanType GetFuzzDistortion(const Image *image,
       *restrict q;
 
     register ssize_t
-      i,
       x;
 
     if (status == MagickFalse)
@@ -560,13 +559,13 @@ static MagickBooleanType GetFuzzDistortion(const Image *image,
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
     #pragma omp critical (MagickCore_GetFuzzDistortion)
 #endif
-    for (i=0; i <= MaxPixelChannels; i++)
-      distortion[i]+=channel_distortion[i];
+    for (j=0; j <= MaxPixelChannels; j++)
+      distortion[j]+=channel_distortion[j];
   }
   reconstruct_view=DestroyCacheView(reconstruct_view);
   image_view=DestroyCacheView(image_view);
-  for (i=0; i <= MaxPixelChannels; i++)
-    distortion[i]/=((double) columns*rows);
+  for (j=0; j <= MaxPixelChannels; j++)
+    distortion[j]/=((double) columns*rows);
   distortion[CompositePixelChannel]/=(double) GetImageChannels(image);
   distortion[CompositePixelChannel]=sqrt(distortion[CompositePixelChannel]);
   return(status);
@@ -583,7 +582,7 @@ static MagickBooleanType GetMeanAbsoluteDistortion(const Image *image,
     status;
 
   register ssize_t
-    i;
+    j;
 
   size_t
     columns,
@@ -611,7 +610,6 @@ static MagickBooleanType GetMeanAbsoluteDistortion(const Image *image,
       *restrict q;
 
     register ssize_t
-      i,
       x;
 
     if (status == MagickFalse)
@@ -665,13 +663,13 @@ static MagickBooleanType GetMeanAbsoluteDistortion(const Image *image,
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
     #pragma omp critical (MagickCore_GetMeanAbsoluteError)
 #endif
-    for (i=0; i <= MaxPixelChannels; i++)
-      distortion[i]+=channel_distortion[i];
+    for (j=0; j <= MaxPixelChannels; j++)
+      distortion[j]+=channel_distortion[j];
   }
   reconstruct_view=DestroyCacheView(reconstruct_view);
   image_view=DestroyCacheView(image_view);
-  for (i=0; i <= MaxPixelChannels; i++)
-    distortion[i]/=((double) columns*rows);
+  for (j=0; j <= MaxPixelChannels; j++)
+    distortion[j]/=((double) columns*rows);
   distortion[CompositePixelChannel]/=(double) GetImageChannels(image);
   return(status);
 }
@@ -783,7 +781,7 @@ static MagickBooleanType GetMeanSquaredDistortion(const Image *image,
     status;
 
   register ssize_t
-    i;
+    j;
 
   size_t
     columns,
@@ -811,7 +809,6 @@ static MagickBooleanType GetMeanSquaredDistortion(const Image *image,
       *restrict q;
 
     register ssize_t
-      i,
       x;
 
     if (status == MagickFalse)
@@ -865,13 +862,13 @@ static MagickBooleanType GetMeanSquaredDistortion(const Image *image,
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
     #pragma omp critical (MagickCore_GetMeanSquaredError)
 #endif
-    for (i=0; i <= MaxPixelChannels; i++)
-      distortion[i]+=channel_distortion[i];
+    for (j=0; j <= MaxPixelChannels; j++)
+      distortion[j]+=channel_distortion[j];
   }
   reconstruct_view=DestroyCacheView(reconstruct_view);
   image_view=DestroyCacheView(image_view);
-  for (i=0; i <= MaxPixelChannels; i++)
-    distortion[i]/=((double) columns*rows);
+  for (j=0; j <= MaxPixelChannels; j++)
+    distortion[j]/=((double) columns*rows);
   distortion[CompositePixelChannel]/=GetImageChannels(image);
   return(status);
 }
@@ -1073,7 +1070,7 @@ static MagickBooleanType GetPeakAbsoluteDistortion(const Image *image,
       *restrict q;
 
     register ssize_t
-      i,
+      j,
       x;
 
     if (status == MagickFalse)
@@ -1129,9 +1126,9 @@ static MagickBooleanType GetPeakAbsoluteDistortion(const Image *image,
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
     #pragma omp critical (MagickCore_GetPeakAbsoluteError)
 #endif
-    for (i=0; i <= MaxPixelChannels; i++)
-      if (channel_distortion[i] > distortion[i])
-        distortion[i]=channel_distortion[i];
+    for (j=0; j <= MaxPixelChannels; j++)
+      if (channel_distortion[j] > distortion[j])
+        distortion[j]=channel_distortion[j];
   }
   reconstruct_view=DestroyCacheView(reconstruct_view);
   image_view=DestroyCacheView(image_view);

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index b83b89ef86595f06d7adb01e5d6df97a77e24028..e987ced392ad9e0f1bca8bb138056c8924ec291e 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -770,11 +770,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
     case BlurCompositeOp:
     {
       CacheView
-        *canvas_view,
-        *source_view;
-
-      const char
-        *value;
+        *canvas_view;
 
       MagickRealType
         angle_range,
@@ -946,12 +942,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
     case DistortCompositeOp:
     {
       CacheView
-        *source_view,
-        *canvas_view,
-        *image_view;
-
-      const char
-        *value;
+        *canvas_view;
 
       MagickRealType
         horizontal_scale,
@@ -1121,9 +1112,6 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
     }
     case DissolveCompositeOp:
     {
-      const char
-        *value;
-
       /*
         Geometry arguments to dissolve factors.
       */
@@ -1149,9 +1137,6 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
     }
     case BlendCompositeOp:
     {
-      const char
-        *value;
-
       value=GetImageArtifact(image,"compose:args");
       if (value != (char *) NULL)
         {
@@ -1165,9 +1150,6 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
     }
     case MathematicsCompositeOp:
     {
-      const char
-        *value;
-
       /*
         Just collect the values from "compose:args", setting.
         Unused values are set to zero automagically.
@@ -1184,9 +1166,6 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
     }
     case ModulateCompositeOp:
     {
-      const char
-        *value;
-
       /*
         Determine the luma and chroma scale.
       */
@@ -1202,9 +1181,6 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
     }
     case ThresholdCompositeOp:
     {
-      const char
-        *value;
-
       /*
         Determine the amount and threshold.
       */

diff --git a/MagickCore/configure.c b/MagickCore/configure.c
index a6f5568f229b704b0adc40fd751edc29caf9550f..f4596a461086722845ee6b9293ae59b8b6d621ac 100755 (executable)
--- a/MagickCore/configure.c
+++ b/MagickCore/configure.c
@@ -1193,7 +1193,7 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache,
                 {
                   char
                     path[MagickPathExtent],
-                    *xml;
+                    *fileXml;
 
                   GetPathComponent(filename,HeadPath,path);
                   if (*path != '\0')
@@ -1203,12 +1203,12 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache,
                     (void) CopyMagickString(path,token,MagickPathExtent);
                   else
                     (void) ConcatenateMagickString(path,token,MagickPathExtent);
-                  xml=FileToXML(path,~0UL);
-                  if (xml != (char *) NULL)
+                  fileXml=FileToXML(path,~0UL);
+                  if (fileXml != (char *) NULL)
                     {
-                      status&=LoadConfigureCache(configure_cache,xml,path,
+                      status&=LoadConfigureCache(configure_cache,fileXml,path,
                         depth+1,exception);
-                      xml=(char *) RelinquishMagickMemory(xml);
+                      fileXml=(char *) RelinquishMagickMemory(fileXml);
                     }
                 }
             }

diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c
index 41d8de78875c221e4068a73352da72caa9d5668c..24176f0b6aee5836d31288d0e4909cba6e9def5a 100644 (file)
--- a/MagickCore/constitute.c
+++ b/MagickCore/constitute.c
@@ -722,9 +722,6 @@ MagickExport Image *ReadImage(const ImageInfo *image_info,
     option=GetImageOption(image_info,"delay");
     if (option != (const char *) NULL)
       {
-        GeometryInfo
-          geometry_info;
-
         flags=ParseGeometry(option,&geometry_info);
         if ((flags & GreaterValue) != 0)
           {
@@ -1062,11 +1059,11 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info,
       (GetMagickSeekableStream(magick_info) != MagickFalse))
     {
       char
-        filename[MagickPathExtent];
+        image_filename[MagickPathExtent];
 
-      (void) CopyMagickString(filename,image->filename,MagickPathExtent);
+      (void) CopyMagickString(image_filename,image->filename,MagickPathExtent);
       status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
-      (void) CopyMagickString(image->filename,filename,MagickPathExtent);
+      (void) CopyMagickString(image->filename, image_filename,MagickPathExtent);
       if (status != MagickFalse)
         {
           if (IsBlobSeekable(image) == MagickFalse)
@@ -1239,7 +1236,7 @@ MagickExport MagickBooleanType WriteImages(const ImageInfo *image_info,
     proceed;
 
   MagickOffsetType
-    i;
+    progress;
 
   MagickProgressMonitor
     progress_monitor;
@@ -1293,7 +1290,7 @@ MagickExport MagickBooleanType WriteImages(const ImageInfo *image_info,
   */
   status=MagickTrue;
   progress_monitor=(MagickProgressMonitor) NULL;
-  i=0;
+  progress=0;
   number_images=GetImageListLength(images);
   for (p=images; p != (Image *) NULL; p=GetNextImageInList(p))
   {
@@ -1307,7 +1304,7 @@ MagickExport MagickBooleanType WriteImages(const ImageInfo *image_info,
       break;
     if (number_images != 1)
       {
-        proceed=SetImageProgress(p,WriteImageTag,i++,number_images);
+        proceed=SetImageProgress(p,WriteImageTag,progress++,number_images);
         if (proceed == MagickFalse)
           break;
       }

diff --git a/MagickCore/exception-private.h b/MagickCore/exception-private.h
index c81bdbf983f9227b595906af577a60f06ff6cdef..89846ebf06b415e4efc402a121371af6ceb2deea 100644 (file)
--- a/MagickCore/exception-private.h
+++ b/MagickCore/exception-private.h
@@ -36,30 +36,31 @@ extern "C" {
 #define ThrowFatalException(severity,tag) \
 { \
   char \
-    *message; \
+    *fatal_message; \
  \
   ExceptionInfo \
-    *exception; \
+    *fatal_exception; \
  \
-  exception=AcquireExceptionInfo(); \
-  message=GetExceptionMessage(errno); \
-  (void) ThrowMagickException(exception,GetMagickModule(),severity, \
-    tag == (const char *) NULL ? "unknown" : tag,"`%s'",message); \
-  message=DestroyString(message); \
-  CatchException(exception); \
-  (void) DestroyExceptionInfo(exception); \
+  fatal_exception=AcquireExceptionInfo(); \
+  fatal_message=GetExceptionMessage(errno); \
+  (void) ThrowMagickException(fatal_exception,GetMagickModule(),severity, \
+    tag == (const char *) NULL ? "unknown" : tag,"`%s'",fatal_message); \
+  fatal_message=DestroyString(fatal_message); \
+  CatchException(fatal_exception); \
+  (void) DestroyExceptionInfo(fatal_exception); \
   MagickCoreTerminus(); \
   _exit((int) (severity-FatalErrorException)+1); \
 }
 #define ThrowFileException(exception,severity,tag,context) \
 { \
   char \
-    *message; \
+    *file_message; \
  \
-  message=GetExceptionMessage(errno); \
+  file_message=GetExceptionMessage(errno); \
   (void) ThrowMagickException(exception,GetMagickModule(),severity, \
-    tag == (const char *) NULL ? "unknown" : tag,"'%s': %s",context,message); \
-  message=DestroyString(message); \
+    tag == (const char *) NULL ? "unknown" : tag,"'%s': %s",context, \
+    file_message); \
+  file_message=DestroyString(file_message); \
 }
 #define ThrowImageException(severity,tag) \
 { \

diff --git a/MagickWand/magick-wand-private.h b/MagickWand/magick-wand-private.h
index 4ca29b8af2059405a5f654241426e275549d6cae..d8ced8a21d103f30fbe7839bf834f4be63f2f365 100644 (file)
--- a/MagickWand/magick-wand-private.h
+++ b/MagickWand/magick-wand-private.h
@@ -35,13 +35,13 @@ extern "C" {
 #define ThrowWandFatalException(severity,tag,context) \
 { \
   ExceptionInfo \
-    *exception; \
+    *fatal_exception; \
  \
-  exception=AcquireExceptionInfo(); \
-  (void) ThrowMagickException(exception,GetMagickModule(),severity,tag, \
+  fatal_exception=AcquireExceptionInfo(); \
+  (void) ThrowMagickException(fatal_exception,GetMagickModule(),severity,tag, \
     "`%s'",context); \
-  CatchException(exception); \
-  (void) DestroyExceptionInfo(exception); \
+  CatchException(fatal_exception); \
+  (void) DestroyExceptionInfo(fatal_exception); \
   MagickWandTerminus(); \
   _exit((int) (severity-FatalErrorException)+1); \
 } 

diff --git a/coders/dpx.c b/coders/dpx.c
index bd09f82323a6ac848b93bfc4d22d99bc9b47aa72..283f5415d29d38eff58a53240159f1a4aa5c2b13 100644 (file)
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -1502,12 +1502,6 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image,
   vertical_factor=4;
   if (image_info->sampling_factor != (char *) NULL)
     {
-      GeometryInfo
-        geometry_info;
-
-      MagickStatusType
-        flags;
-
       flags=ParseGeometry(image_info->sampling_factor,&geometry_info);
       horizontal_factor=(ssize_t) geometry_info.rho;
       vertical_factor=(ssize_t) geometry_info.sigma;

diff --git a/coders/xtrn.c b/coders/xtrn.c
index e73f333faf1bc21321706d9fe618aec681c1791b..e172f9e43e9ae078e5036d9ef1e9cca89c1f1973 100644 (file)
--- a/coders/xtrn.c
+++ b/coders/xtrn.c
@@ -110,6 +110,7 @@ static MagickBooleanType
 %
 */
 #if defined(_VISUALC_)
+#  pragma warning(disable : 4477)
 static Image *ReadXTRNImage(const ImageInfo *image_info,
   ExceptionInfo *exception)
 {
@@ -227,6 +228,7 @@ static Image *ReadXTRNImage(const ImageInfo *image_info,
   clone_info=DestroyImageInfo(clone_info);
   return(image);
 }
+#  pragma warning(default : 4477)
 #endif
 \f
 /*
@@ -398,6 +400,7 @@ static size_t SafeArrayFifo(const Image *image,const void *data,
 #endif
 
 #if defined(_VISUALC_)
+#  pragma warning(disable : 4477)
 static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,
   Image *image,ExceptionInfo *exception)
 {
@@ -532,4 +535,5 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,
     }
   return(MagickTrue);
 }
+#  pragma warning(default : 4477)
 #endif