[trunk] Remove some more warnings about conversion

diff --git a/src/lib/openjp2/mct.c b/src/lib/openjp2/mct.c
index 5e933ce58aae41eab2891e03857a7850430e3094..d2754dc2666e3ea4b95eebccbc55f99875eaeffa 100644 (file)
--- a/src/lib/openjp2/mct.c
+++ b/src/lib/openjp2/mct.c
@@ -230,7 +230,7 @@ OPJ_BOOL opj_mct_encode_custom(
        lCurrentMatrix = lCurrentData + pNbComp;
 
        for (i =0;i<lNbMatCoeff;++i) {
-               lCurrentMatrix[i] = (OPJ_INT32) (*(lMct++) * lMultiplicator);
+               lCurrentMatrix[i] = (OPJ_INT32) (*(lMct++) * (OPJ_FLOAT32)lMultiplicator);
        }
 
        for (i = 0; i < n; ++i)  {

diff --git a/src/lib/openjp2/raw.c b/src/lib/openjp2/raw.c
index 1702d36f5b3855f86805ee08503c4b5bfc934fb6..3d0aa5baf6af43fde0edc87e35617ead66e43f86 100644 (file)
--- a/src/lib/openjp2/raw.c
+++ b/src/lib/openjp2/raw.c
@@ -54,7 +54,9 @@ void opj_raw_destroy(opj_raw_t *raw) {
 }
 
 OPJ_UINT32 opj_raw_numbytes(opj_raw_t *raw) {
-       return raw->bp - raw->start;
+       const ptrdiff_t diff = raw->bp - raw->start;
+  assert( diff <= 0xffffffff && diff >= 0 ); /* UINT32_MAX */
+       return (OPJ_UINT32)diff;
 }
 
 void opj_raw_init_dec(opj_raw_t *raw, OPJ_BYTE *bp, OPJ_UINT32 len) {

diff --git a/src/lib/openjp2/tgt.c b/src/lib/openjp2/tgt.c
index 6fd85587b9acc3055652101047570e504f33bc32..81b05482bca1a25d5c2e1cedcf1edcff8d780e5a 100644 (file)
--- a/src/lib/openjp2/tgt.c
+++ b/src/lib/openjp2/tgt.c
@@ -87,7 +87,7 @@ opj_tgt_tree_t *opj_tgt_create(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv) {
                 return 00;
         }
         memset(tree->nodes,0,tree->numnodes * sizeof(opj_tgt_node_t));
-        tree->nodes_size = tree->numnodes * sizeof(opj_tgt_node_t);
+        tree->nodes_size = tree->numnodes * (OPJ_UINT32)sizeof(opj_tgt_node_t);
 
         node = tree->nodes;
         l_parent_node = &tree->nodes[tree->numleafsh * tree->numleafsv];
@@ -166,7 +166,7 @@ opj_tgt_tree_t *opj_tgt_init(opj_tgt_tree_t * p_tree,OPJ_UINT32 p_num_leafs_h, O
                         opj_tgt_destroy(p_tree);
                         return 00;
                 }
-                l_node_size = p_tree->numnodes * sizeof(opj_tgt_node_t);
+                l_node_size = p_tree->numnodes * (OPJ_UINT32)sizeof(opj_tgt_node_t);
                 
                 if (l_node_size > p_tree->nodes_size) {
                         opj_tgt_node_t* new_nodes = (opj_tgt_node_t*) opj_realloc(p_tree->nodes, l_node_size);