]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Sat, 25 Oct 2014 17:51:16 +0000 (17:51 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Sat, 25 Oct 2014 17:51:16 +0000 (17:51 +0000)
coders/jp2.c

index a47028d9779d56b7baeda2bb10df327ee0c4de6c..7fbaac4755f1863a87c85fb27c9f947d9981c783 100644 (file)
@@ -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)))