From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 25 Oct 2014 17:51:16 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1847
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dabb4d88b877b54b55d6ccf001da3f26b454ec6c;p=imagemagick

---

diff --git a/coders/jp2.c b/coders/jp2.c
index a47028d97..7fbaac475 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -843,10 +843,10 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image,
         Set tile size.
       */
       flags=ParseAbsoluteGeometry(image_info->extract,&geometry);
-      parameters.cp_tdx=(ssize_t) geometry.width;
-      parameters.cp_tdy=(ssize_t) geometry.width;
+      parameters.cp_tdx=(int) geometry.width;
+      parameters.cp_tdy=(int) geometry.width;
       if ((flags & HeightValue) != 0)
-        parameters.cp_tdy=(ssize_t) geometry.height;
+        parameters.cp_tdy=(int) geometry.height;
       if ((flags & XValue) != 0)
         parameters.cp_tx0=geometry.x;
       if ((flags & YValue) != 0)
@@ -961,10 +961,10 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image,
     ThrowWriterException(DelegateError,"UnableToEncodeImageFile");
   jp2_image->x0=parameters.image_offset_x0;
   jp2_image->y0=parameters.image_offset_y0;
-  jp2_image->x1=2*parameters.image_offset_x0+(image->columns-1)*
-    parameters.subsampling_dx+1;
-  jp2_image->y1=2*parameters.image_offset_y0+(image->rows-1)*
-    parameters.subsampling_dx+1;
+  jp2_image->x1=(unsigned int) (2*parameters.image_offset_x0+(image->columns-1)*
+    parameters.subsampling_dx+1);
+  jp2_image->y1=(unsigned int) (2*parameters.image_offset_y0+(image->rows-1)*
+    parameters.subsampling_dx+1);
   if ((image->depth == 12) &&
       ((image->columns == 2048) || (image->rows == 1080) ||
        (image->columns == 4096) || (image->rows == 2160)))