From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 15 Dec 2014 22:13:06 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1632
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40a5c455ade0046871a4e93e41585465ff6c575a;p=imagemagick

---

diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index ffcaeecf5..d01a4dc46 100644
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -2154,7 +2154,7 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image,
   }
   for (i=0; i < (ssize_t) MaxPixelChannels; i++)
   {
-    PixelTrait traits=GetPixelChannelTraits(image,i);
+    PixelTrait traits=GetPixelChannelTraits(image,(PixelChannel) i);
     if ((traits & UpdatePixelTrait) == 0)
       continue;
     channel_statistics[CompositePixelChannel].area+=channel_statistics[i].area;
diff --git a/coders/pnm.c b/coders/pnm.c
index 50a8a2dbb..7b501fd45 100644
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -209,7 +209,7 @@ static unsigned int PNMInteger(Image *image,const unsigned int base,
     if (value > (unsigned int) (INT_MAX/10))
       break;
     value*=10;
-    if (value > (INT_MAX-(c-(int) '0')))
+    if (value > (unsigned int) (INT_MAX-(c-(int) '0')))
       break;
     value+=c-(int) '0';
     c=ReadBlobByte(image);
diff --git a/coders/xbm.c b/coders/xbm.c
index e952bfb64..73d2f770d 100644
--- a/coders/xbm.c
+++ b/coders/xbm.c
@@ -158,7 +158,7 @@ static unsigned int XBMInteger(Image *image,short int *hex_digits)
       break;
     value*=16;
     c&=0xff;
-    if (value > (INT_MAX-hex_digits[c]))
+    if (value > (unsigned int) (INT_MAX-hex_digits[c]))
       break;
     value+=hex_digits[c];
     c=ReadBlobByte(image);