From f2cec1fc8a3a99cf598c29b9e07c1fbfe4ec0fbf Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 8 Jun 2015 22:35:29 +0000 Subject: [PATCH] --- MagickCore/magic.c | 6 +++--- coders/jp2.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/MagickCore/magic.c b/MagickCore/magic.c index 0d33e96e7..3ca21e166 100644 --- a/MagickCore/magic.c +++ b/MagickCore/magic.c @@ -249,9 +249,9 @@ static int CompareMagickInfoSize(const void *a,const void *b) *ma, *mb; - ma=(MagicInfo *)a; - mb=(MagicInfo *)b; - return((mb->offset+mb->length) - (ma->offset+ma->length)); + ma=(MagicInfo *) a; + mb=(MagicInfo *) b; + return((int) ((mb->offset+mb->length)-(ma->offset+ma->length))); } static LinkedListInfo *AcquireMagicCache(const char *filename, diff --git a/coders/jp2.c b/coders/jp2.c index ba7d5a82e..d7a704b29 100644 --- a/coders/jp2.c +++ b/coders/jp2.c @@ -803,7 +803,8 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image, */ opj_set_default_encoder_parameters(¶meters); for (i=1; i < 6; i++) - if (((1U << (i+2)) > image->columns) && ((1U << (i+2)) > image->rows)) + if (((1L << (i+2)) > (ssize_t) image->columns) && + ((1L << (i+2)) > (ssize_t) image->rows)) break; parameters.numresolution=i; option=GetImageOption(image_info,"jp2:number-resolutions"); -- 2.40.0