From dd5c3a9c8e4343cf438b807372e58a0742273dbf Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Thu, 6 Mar 2014 16:29:03 +0000 Subject: [PATCH] [trunk] Remove some easy warnings --- src/bin/jp2/convert.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/jp2/convert.c b/src/bin/jp2/convert.c index a49ea838..f99cd169 100644 --- a/src/bin/jp2/convert.c +++ b/src/bin/jp2/convert.c @@ -1431,7 +1431,7 @@ static inline int clamp( const int value, const int prec, const int sgnd ) { if (prec <= 8) return CLAMP(value,0,255); else if (prec <= 16) return CLAMP(value,0,65535); - else return CLAMP(value,0,4294967295); + else return value; /*CLAMP(value,0,4294967295);*/ } } @@ -3012,11 +3012,11 @@ static opj_image_t* rawtoimage_common(const char *filename, opj_cparameters_t *p } if( big_endian ) { - value = (unsigned short)(temp1 << 8 + temp2); + value = (unsigned short)((temp1 << 8) + temp2); } else { - value = (unsigned short)(temp2 << 8 + temp1); + value = (unsigned short)((temp2 << 8) + temp1); } image->comps[compno].data[i] = raw_cp->rawSigned?(short)value:value; }