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

Fix warning in rle4 decoding

This commit is contained in:
mayeut 2015-09-23 21:09:19 +02:00
parent 281537851b
commit faf63fddad
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/jp2/convertbmp.c
View File

@ -572,7 +572,7 @@ static OPJ_BOOL bmp_read_rle4_data(FILE* IN, OPJ_UINT8* pData, OPJ_UINT32 stride
OPJ_UINT8 c1 = (OPJ_UINT8)getc(IN); OPJ_UINT8 c1 = (OPJ_UINT8)getc(IN);
for (j = 0; (j < c) && (x < width) && ((OPJ_SIZE_T)pix < (OPJ_SIZE_T)beyond); j++, x++, pix++) { for (j = 0; (j < c) && (x < width) && ((OPJ_SIZE_T)pix < (OPJ_SIZE_T)beyond); j++, x++, pix++) {
*pix = (j&1) ? (c1 & 0x0f) : ((c1>>4)&0x0f); *pix = (OPJ_UINT8)((j&1) ? (c1 & 0x0fU) : ((c1>>4)&0x0fU));
} }
} }
else { /* absolute mode */ else { /* absolute mode */
@ -598,7 +598,7 @@ static OPJ_BOOL bmp_read_rle4_data(FILE* IN, OPJ_UINT8* pData, OPJ_UINT32 stride
if((j&1) == 0) { if((j&1) == 0) {
c1 = (OPJ_UINT8)getc(IN); c1 = (OPJ_UINT8)getc(IN);
} }
*pix = (j&1) ? (c1 & 0x0f) : ((c1>>4)&0x0f); *pix = (OPJ_UINT8)((j&1) ? (c1 & 0x0fU) : ((c1>>4)&0x0fU));
} }
if(((c&3) == 1) || ((c&3) == 2)) { /* skip padding byte */ if(((c&3) == 1) || ((c&3) == 2)) { /* skip padding byte */
getc(IN); getc(IN);