X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmjasper%2Fsrc%2Flibjasper%2Fbase%2Fjas_icc.c;h=0ef2d8971596841298a760258f4397d086607dd3;hb=e167d27c34ff982bd32e4a7ab56699751faf2637;hp=5794e2c5a020fb8dc585a07cc43d4cf388446b62;hpb=92caef4ab9527cc610e45d51e6fde0d94a045088;p=gdcm.git diff --git a/src/gdcmjasper/src/libjasper/base/jas_icc.c b/src/gdcmjasper/src/libjasper/base/jas_icc.c index 5794e2c5..0ef2d897 100644 --- a/src/gdcmjasper/src/libjasper/base/jas_icc.c +++ b/src/gdcmjasper/src/libjasper/base/jas_icc.c @@ -328,6 +328,7 @@ jas_iccprof_t *jas_iccprof_load(jas_stream_t *in) #if 0 jas_eprintf("warning: skipping unknown tag type\n"); #endif + (void)attrvalinfo; /*'attrvalinfo' is assigned a value that is never used in function jas_iccprof_load*/ prevattrval = 0; continue; } @@ -1074,6 +1075,7 @@ static int jas_icctxtdesc_copy(jas_iccattrval_t *attrval, attrval = 0; othattrval = 0; txtdesc = 0; + (void)txtdesc; /* Not yet implemented. */ abort(); @@ -1260,6 +1262,7 @@ static int jas_icclut8_copy(jas_iccattrval_t *attrval, attrval = 0; othattrval = 0; lut8 = 0; + (void)lut8; abort(); return -1; } @@ -1600,7 +1603,7 @@ static int jas_iccgetuint16(jas_stream_t *in, jas_iccuint16_t *val) ulonglong tmp; if (jas_iccgetuint(in, 2, &tmp)) return -1; - *val = tmp; + *val = (jas_iccuint16_t)tmp; /* warning C4244: '=' : conversion from 'ulonglong' to 'jas_iccuint16_t', possible loss of data */ return 0; } @@ -1609,8 +1612,8 @@ static int jas_iccgetsint32(jas_stream_t *in, jas_iccsint32_t *val) ulonglong tmp; if (jas_iccgetuint(in, 4, &tmp)) return -1; - *val = (tmp & 0x80000000) ? (-JAS_CAST(longlong, (((~tmp) & - 0x7fffffff) + 1))) : JAS_CAST(longlong, tmp); + *val = (jas_iccsint32_t)((tmp & 0x80000000) ? (-JAS_CAST(longlong, (((~tmp) & + 0x7fffffff) + 1))) : JAS_CAST(longlong, tmp)); /* warning C4244: '=' : conversion from 'longlong' to 'jas_iccsint32_t', possible loss of data */ return 0; } @@ -1619,7 +1622,7 @@ static int jas_iccgetuint32(jas_stream_t *in, jas_iccuint32_t *val) ulonglong tmp; if (jas_iccgetuint(in, 4, &tmp)) return -1; - *val = tmp; + *val = (jas_iccuint32_t)tmp; /* warning C4244: '=' : conversion from 'ulonglong' to 'jas_iccuint32_t', possible loss of data */ return 0; } @@ -1637,7 +1640,7 @@ static int jas_iccputuint(jas_stream_t *out, int n, ulonglong val) int i; int c; for (i = n; i > 0; --i) { - c = (val >> (8 * (i - 1))) & 0xff; + c = (int)((val >> (8 * (i - 1))) & 0xff); /* warning C4244: '=' : conversion from 'ulonglong' to 'int', possible loss of data */ if (jas_stream_putc(out, c) == EOF) return -1; }