X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmjasper%2Fsrc%2Flibjasper%2Fjp2%2Fjp2_cod.c;h=d3c5186979e4e2ea4be976c16a40c9dd0cb53e6b;hb=6237b242dba31eddbd81ba4c4b167bcf82a51c37;hp=687eb09731eeea4e4eba674a1f8d6d5f42804cde;hpb=92caef4ab9527cc610e45d51e6fde0d94a045088;p=gdcm.git

diff --git a/src/gdcmjasper/src/libjasper/jp2/jp2_cod.c b/src/gdcmjasper/src/libjasper/jp2/jp2_cod.c
index 687eb097..d3c51869 100644
--- a/src/gdcmjasper/src/libjasper/jp2/jp2_cod.c
+++ b/src/gdcmjasper/src/libjasper/jp2/jp2_cod.c
@@ -64,7 +64,7 @@
 /*
  * JP2 Library
  *
- * $Id: jp2_cod.c,v 1.1 2005/05/22 18:33:03 malaterre Exp $
+ * $Id: jp2_cod.c,v 1.2 2005/06/09 22:02:00 malaterre Exp $
  */
 
 /******************************************************************************\
@@ -262,7 +262,7 @@ jp2_box_t *jp2_box_get(jas_stream_t *in)
     if (jp2_getuint64(in, &extlen)) {
       goto error;
     }
-    box->len = extlen;
+    box->len = (uint_fast32_t)extlen; /* warning C4244: '=' : conversion from 'uint_fast64_t' to 'uint_fast32_t', possible loss of data */
   }
   if (box->len != 0 && box->len < 8) {
     goto error;
@@ -704,8 +704,8 @@ static int jp2_putuint32(jas_stream_t *out, uint_fast32_t val)
 
 static int jp2_putuint64(jas_stream_t *out, uint_fast64_t val)
 {
-  if (jp2_putuint32(out, (val >> 32) & 0xffffffffUL) ||
-    jp2_putuint32(out, val & 0xffffffffUL)) {
+  if (jp2_putuint32(out, (uint_fast32_t)((val >> 32) & 0xffffffffUL) ||
+    jp2_putuint32(out, (uint_fast32_t)(val & 0xffffffffUL)))) { /* warning C4244: 'function' : conversion from 'uint_fast64_t' to 'uint_fast32_t', possible loss of data */
     return -1;
   }
   return 0;