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

diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c
index c845df1f2c09cf0724b0c4f0c9199021dfa27b5b..7ed9a54c0eef8bee3b75ad4d45f25c02929c06fa 100644 (file)
--- 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 3d0aa5baf6af43fde0edc87e35617ead66e43f86..8e705ccd5454ca0027efe28f2eb0b3c420ef154f 100644 (file)
--- 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 abac3fe46b37e2d91cbd6d74c97f1a8785f77a52..c7e29952f05be6381ba2637971d49922776c4c87 100644 (file)
--- 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;
 }