]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Tue, 14 Aug 2012 13:10:48 +0000 (13:10 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Tue, 14 Aug 2012 13:10:48 +0000 (13:10 +0000)
coders/jnx.c

index a5278a10fa4598e8ba77aa74fced4f6265a17b90..b5b22d7c5337a076a50f90dddb4905a3002df6fd 100644 (file)
@@ -173,10 +173,10 @@ static Image *ReadJNXImage(const ImageInfo *image_info,ExceptionInfo *exception)
   if ((jnx_info.version != 3) && (jnx_info.version != 4))
     ThrowReaderException(CorruptImageError,"ImproperImageHeader");
   jnx_info.serial=(int) ReadBlobLSBLong(image);
-  jnx_info.northeast.x=180.0*ReadBlobLSBLong(image)/0x7fffffff;
-  jnx_info.northeast.y=180.0*ReadBlobLSBLong(image)/0x7fffffff;
-  jnx_info.southwest.x=180.0*ReadBlobLSBLong(image)/0x7fffffff;
-  jnx_info.southwest.y=180.0*ReadBlobLSBLong(image)/0x7fffffff;
+  jnx_info.northeast.x=180.0*((int) ReadBlobLSBLong(image))/0x7fffffff;
+  jnx_info.northeast.y=180.0*((int) ReadBlobLSBLong(image))/0x7fffffff;
+  jnx_info.southwest.x=180.0*((int) ReadBlobLSBLong(image))/0x7fffffff;
+  jnx_info.southwest.y=180.0*((int) ReadBlobLSBLong(image))/0x7fffffff;
   jnx_info.levels=(int) ReadBlobLSBLong(image);
   if (jnx_info.levels > JNXMaxLevels)
     ThrowReaderException(CorruptImageError,"ImproperImageHeader");
@@ -259,10 +259,10 @@ static Image *ReadJNXImage(const ImageInfo *image_info,ExceptionInfo *exception)
       unsigned int
         tile_length;
 
-      northeast.x=180.0*ReadBlobLSBLong(image)/0x7fffffff;
-      northeast.y=180.0*ReadBlobLSBLong(image)/0x7fffffff;
-      southwest.x=180.0*ReadBlobLSBLong(image)/0x7fffffff;
-      southwest.y=180.0*ReadBlobLSBLong(image)/0x7fffffff;
+      northeast.x=180.0*((int) ReadBlobLSBLong(image))/0x7fffffff;
+      northeast.y=180.0*((int) ReadBlobLSBLong(image))/0x7fffffff;
+      southwest.x=180.0*((int) ReadBlobLSBLong(image))/0x7fffffff;
+      southwest.y=180.0*((int) ReadBlobLSBLong(image))/0x7fffffff;
       (void) ReadBlobLSBShort(image); /* width */
       (void) ReadBlobLSBShort(image); /* height */
       tile_length=ReadBlobLSBLong(image);