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

[trunk] Fix remainings warnings on linux/32bits arch

This commit is contained in:
Mathieu Malaterre 2014-03-11 10:28:04 +00:00
parent fa436eb368
commit 5dd770746b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/openjp2/jp2.c
View File

@ -1004,12 +1004,12 @@ OPJ_BOOL opj_jp2_read_pclr( opj_jp2_t *jp2,
if (bytes_to_read > sizeof(OPJ_UINT32)) if (bytes_to_read > sizeof(OPJ_UINT32))
bytes_to_read = sizeof(OPJ_UINT32); bytes_to_read = sizeof(OPJ_UINT32);
if ((ptrdiff_t)p_pclr_header_size < p_pclr_header_data - orig_header_data + bytes_to_read) if ((ptrdiff_t)p_pclr_header_size < p_pclr_header_data - orig_header_data + (ptrdiff_t)bytes_to_read)
return OPJ_FALSE; return OPJ_FALSE;
if (bytes_to_read > sizeof(OPJ_UINT32)) if (bytes_to_read > sizeof(OPJ_UINT32))
bytes_to_read = sizeof(OPJ_UINT32); bytes_to_read = sizeof(OPJ_UINT32);
if ((ptrdiff_t)p_pclr_header_size < p_pclr_header_data - orig_header_data + bytes_to_read) if ((ptrdiff_t)p_pclr_header_size < p_pclr_header_data - orig_header_data + (ptrdiff_t)bytes_to_read)
return OPJ_FALSE; return OPJ_FALSE;
opj_read_bytes(p_pclr_header_data, &l_value , bytes_to_read); /* Cji */ opj_read_bytes(p_pclr_header_data, &l_value , bytes_to_read); /* Cji */

2
src/lib/openjp2/raw.c
View File

@ -55,7 +55,7 @@ void opj_raw_destroy(opj_raw_t *raw) {
OPJ_UINT32 opj_raw_numbytes(opj_raw_t *raw) { OPJ_UINT32 opj_raw_numbytes(opj_raw_t *raw) {
const ptrdiff_t diff = raw->bp - raw->start; const ptrdiff_t diff = raw->bp - raw->start;
assert( diff <= 0xffffffff && diff >= 0 ); /* UINT32_MAX */ assert( diff <= (ptrdiff_t)0xffffffff && diff >= 0 ); /* UINT32_MAX */
return (OPJ_UINT32)diff; return (OPJ_UINT32)diff;
} }

2
src/lib/openjp2/t2.c
View File

@ -441,7 +441,7 @@ OPJ_BOOL opj_t2_decode_packets( opj_t2_t *p_t2,
/* don't forget to release pi */ /* don't forget to release pi */
opj_pi_destroy(l_pi,l_nb_pocs); opj_pi_destroy(l_pi,l_nb_pocs);
assert( l_current_data - p_src < UINT32_MAX ); assert( l_current_data - p_src < (ptrdiff_t)UINT32_MAX );
*p_data_read = (OPJ_UINT32)(l_current_data - p_src); *p_data_read = (OPJ_UINT32)(l_current_data - p_src);
return OPJ_TRUE; return OPJ_TRUE;
} }