From 5054e3e47d27b6be5aaa6104d1f9ac3ac2a68719 Mon Sep 17 00:00:00 2001
From: dirk <dirk@git.imagemagick.org>
Date: Thu, 22 Sep 2016 23:10:29 +0200
Subject: [PATCH] Silenced warnings.

---
 MagickCore/geometry.c  |  8 ++++----
 MagickCore/image.c     |  3 ---
 MagickWand/composite.c |  3 ---
 MagickWand/montage.c   | 10 +++++-----
 coders/dcm.c           |  4 ++--
 coders/dpx.c           |  1 -
 6 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/MagickCore/geometry.c b/MagickCore/geometry.c
index 5c1cb0b5c..4ff53f570 100644
--- a/MagickCore/geometry.c
+++ b/MagickCore/geometry.c
@@ -1316,7 +1316,7 @@ MagickExport MagickStatusType ParseMetaGeometry(const char *geometry,ssize_t *x,
   if ((flags & PercentValue) != 0)
     {
       MagickStatusType
-        flags;
+        percent_flags;
 
       PointInfo
         scale;
@@ -1324,12 +1324,12 @@ MagickExport MagickStatusType ParseMetaGeometry(const char *geometry,ssize_t *x,
       /*
         Geometry is a percentage of the image size.
       */
-      flags=ParseGeometry(geometry,&geometry_info);
+      percent_flags=ParseGeometry(geometry,&geometry_info);
       scale.x=geometry_info.rho;
-      if ((flags & RhoValue) == 0)
+      if ((percent_flags & RhoValue) == 0)
         scale.x=100.0;
       scale.y=geometry_info.sigma;
-      if ((flags & SigmaValue) == 0)
+      if ((percent_flags & SigmaValue) == 0)
         scale.y=scale.x;
       *width=(size_t) floor(scale.x*former_width/100.0+0.5);
       *height=(size_t) floor(scale.y*former_height/100.0+0.5);
diff --git a/MagickCore/image.c b/MagickCore/image.c
index c6c33656c..43c406486 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -3827,9 +3827,6 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info,
   option=GetImageOption(image_info,"density");
   if (option != (const char *) NULL)
     {
-      GeometryInfo
-        geometry_info;
-
       flags=ParseGeometry(option,&geometry_info);
       image->resolution.x=geometry_info.rho;
       image->resolution.y=geometry_info.sigma;
diff --git a/MagickWand/composite.c b/MagickWand/composite.c
index cbb172454..7fd97b283 100644
--- a/MagickWand/composite.c
+++ b/MagickWand/composite.c
@@ -510,9 +510,6 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
       }
     if (IsCommandOption(option) == MagickFalse)
       {
-        Image
-          *images;
-
         /*
           Read input image.
         */
diff --git a/MagickWand/montage.c b/MagickWand/montage.c
index c67bd604a..570195a56 100644
--- a/MagickWand/montage.c
+++ b/MagickWand/montage.c
@@ -409,17 +409,17 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
           else
             {
               char
-                filename[MagickPathExtent];
+                scene_filename[MagickPathExtent];
 
               /*
                 Form filename for multi-part images.
               */
               (void) InterpretImageFilename(image_info,(Image *) NULL,
-                image_info->filename,(int) scene,filename,exception);
+                image_info->filename,(int) scene,scene_filename,exception);
               if (LocaleCompare(filename,image_info->filename) == 0)
-                (void) FormatLocaleString(filename,MagickPathExtent,"%s.%.20g",
-                  image_info->filename,(double) scene);
-              images=ReadImages(image_info,filename,exception);
+                (void) FormatLocaleString(scene_filename,MagickPathExtent,
+                  "%s.%.20g",image_info->filename,(double) scene);
+              images=ReadImages(image_info,scene_filename,exception);
             }
           status&=(images != (Image *) NULL) &&
             (exception->severity < ErrorException);
diff --git a/coders/dcm.c b/coders/dcm.c
index 26125f778..75489be92 100644
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -3149,7 +3149,6 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             if (strncmp(transfer_syntax,"1.2.840.10008.1.2",17) == 0)
               {
                 int
-                  count,
                   subtype,
                   type;
 
@@ -3157,7 +3156,8 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 subtype=0;
                 if (strlen(transfer_syntax) > 17)
                   {
-                    count=sscanf(transfer_syntax+17,".%d.%d",&type,&subtype);
+                    count=(ssize_t) sscanf(transfer_syntax+17,".%d.%d",&type,
+                      &subtype);
                     if (count < 1)
                       ThrowReaderException(CorruptImageError,
                         "ImproperImageHeader");
diff --git a/coders/dpx.c b/coders/dpx.c
index 66d8eefda..b4a5fde0e 100644
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -1236,7 +1236,6 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception)
         length;
 
       ssize_t
-        count,
         offset;
 
       if (status == MagickFalse)
-- 
2.49.0