walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] Remove some easy warnings

This commit is contained in:
Mathieu Malaterre 2014-03-06 16:29:03 +00:00
parent 0f45e38b52
commit dd5c3a9c8e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/jp2/convert.c
View File

@ -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); if (prec <= 8) return CLAMP(value,0,255);
else if (prec <= 16) return CLAMP(value,0,65535); 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 ) if( big_endian )
{ {
value = (unsigned short)(temp1 << 8 + temp2); value = (unsigned short)((temp1 << 8) + temp2);
} }
else else
{ {
value = (unsigned short)(temp2 << 8 + temp1); value = (unsigned short)((temp2 << 8) + temp1);
} }
image->comps[compno].data[i] = raw_cp->rawSigned?(short)value:value; image->comps[compno].data[i] = raw_cp->rawSigned?(short)value:value;
} }