(no commit message)

diff --git a/MagickCore/magic.c b/MagickCore/magic.c
index 0d33e96e744028d23f4255b6ca600991eda1b80a..3ca21e166728852750252c89ec1e6d05ff64290d 100644 (file)
--- 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 ba7d5a82ebc70cc2260904a974aaa21bf55ee7b2..d7a704b2933143e9a136c1b9c60bdab818d8ccbe 100644 (file)
--- 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(&parameters);
   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");