From: Cristy Date: Sat, 14 Oct 2017 12:32:46 +0000 (-0400) Subject: ... X-Git-Tag: 7.0.7-8~16 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f5083006fc83037a79688435f72c9922cd97f91;p=imagemagick ... --- diff --git a/MagickCore/thread-private.h b/MagickCore/thread-private.h index 9fea9fe38..7eb748742 100644 --- 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 5fd9eca7c..ff28a4638 100644 --- 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 c23faef7f..691bd5765 100755 --- 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