diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-11 10:28:04 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-11 10:28:04 +0000 |
| commit | 5dd770746bed0b2b1cddc80588a66082b08fa4b9 (patch) | |
| tree | f8deec750198988aa9c54d945bf75d0e7a029dc2 /src/lib | |
| parent | fa436eb36871b2c0c996823af7fceb1f629d0ebf (diff) | |
[trunk] Fix remainings warnings on linux/32bits arch
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/openjp2/jp2.c | 4 | ||||
| -rw-r--r-- | src/lib/openjp2/raw.c | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/t2.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c index c845df1f..7ed9a54c 100644 --- a/src/lib/openjp2/jp2.c +++ b/src/lib/openjp2/jp2.c @@ -1004,12 +1004,12 @@ OPJ_BOOL opj_jp2_read_pclr( opj_jp2_t *jp2, if (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; if (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; opj_read_bytes(p_pclr_header_data, &l_value , bytes_to_read); /* Cji */ diff --git a/src/lib/openjp2/raw.c b/src/lib/openjp2/raw.c index 3d0aa5ba..8e705ccd 100644 --- a/src/lib/openjp2/raw.c +++ b/src/lib/openjp2/raw.c @@ -55,7 +55,7 @@ void opj_raw_destroy(opj_raw_t *raw) { OPJ_UINT32 opj_raw_numbytes(opj_raw_t *raw) { 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; } diff --git a/src/lib/openjp2/t2.c b/src/lib/openjp2/t2.c index abac3fe4..c7e29952 100644 --- a/src/lib/openjp2/t2.c +++ b/src/lib/openjp2/t2.c @@ -441,7 +441,7 @@ OPJ_BOOL opj_t2_decode_packets( opj_t2_t *p_t2, /* don't forget to release pi */ 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); return OPJ_TRUE; } |