...

diff --git a/MagickCore/thread-private.h b/MagickCore/thread-private.h
index 9fea9fe38943c2cb314e16ca82e6e656546e7445..7eb748742fe38ef36da49a5e29bfd64d67bb8b4b 100644 (file)
--- a/MagickCore/thread-private.h
+++ b/MagickCore/thread-private.h
@@ -37,7 +37,7 @@ extern "C" {
      (GetImagePixelCacheType(source) == MapCache)) && \
     ((GetImagePixelCacheType(destination) == MemoryCache) || \
      (GetImagePixelCacheType(destination) == MapCache))) ? \
-    MagickMax(MagickMin(GetMagickResourceLimit(ThreadResource),(chunk)/64),1) :\
+    MagickMax(MagickMin((ssize_t) GetMagickResourceLimit(ThreadResource),(ssize_t) (chunk)/64),1) :\
     MagickMax(MagickMin(GetMagickResourceLimit(ThreadResource),2),1))
 
 #if defined(__clang__) || (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 10))

diff --git a/coders/xbm.c b/coders/xbm.c
index 5fd9eca7cf6561478639bda0b5ab24c783c9327b..ff28a4638c9745149fe7b5fd40cb04d4321fe392 100644 (file)
--- a/coders/xbm.c
+++ b/coders/xbm.c
@@ -302,7 +302,7 @@ static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception)
   /*
     Initialize hex values.
   */
-  for (i=0; i < sizeof(hex_digits)/sizeof(*hex_digits); i++)
+  for (i=0; i < (ssize_t) (sizeof(hex_digits)/sizeof(*hex_digits)); i++)
     hex_digits[i]=(-1);
   hex_digits[(int) '0']=0;
   hex_digits[(int) '1']=1;

diff --git a/configure b/configure
index c23faef7fa0c1923fc6fb29ae2b8aee87b261597..691bd576545f9275f431484958f42f6ef4fa2ffd 100755 (executable)
--- a/configure
+++ b/configure
@@ -4534,7 +4534,7 @@ MAGICK_PATCHLEVEL_VERSION=8
 
 MAGICK_VERSION=7.0.7-8
 
-MAGICK_GIT_REVISION=21449:27531f37f:20171008
+MAGICK_GIT_REVISION=21482:77ee74a6c:20171014
 
 
 # Substitute library versioning