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

[trunk] Fix warning about sign conversion 

Update issue 256
This commit is contained in:
Mathieu Malaterre 2014-03-07 10:03:56 +00:00
parent 048c8302fe
commit c0c086388b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/openjp2/tgt.c
View File

@ -62,11 +62,11 @@ opj_tgt_tree_t *opj_tgt_create(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv) {
tree->numleafsv = numleafsv; tree->numleafsv = numleafsv;
numlvls = 0; numlvls = 0;
nplh[0] = numleafsh; nplh[0] = (OPJ_INT32)numleafsh;
nplv[0] = numleafsv; nplv[0] = (OPJ_INT32)numleafsv;
tree->numnodes = 0; tree->numnodes = 0;
do { do {
n = nplh[numlvls] * nplv[numlvls]; n = (OPJ_UINT32)(nplh[numlvls] * nplv[numlvls]);
nplh[numlvls + 1] = (nplh[numlvls] + 1) / 2; nplh[numlvls + 1] = (nplh[numlvls] + 1) / 2;
nplv[numlvls + 1] = (nplv[numlvls] + 1) / 2; nplv[numlvls + 1] = (nplv[numlvls] + 1) / 2;
tree->numnodes += n; tree->numnodes += n;
@ -148,12 +148,12 @@ opj_tgt_tree_t *opj_tgt_init(opj_tgt_tree_t * p_tree,OPJ_UINT32 p_num_leafs_h, O
p_tree->numleafsv = p_num_leafs_v; p_tree->numleafsv = p_num_leafs_v;
l_num_levels = 0; l_num_levels = 0;
l_nplh[0] = p_num_leafs_h; l_nplh[0] = (OPJ_INT32)p_num_leafs_h;
l_nplv[0] = p_num_leafs_v; l_nplv[0] = (OPJ_INT32)p_num_leafs_v;
p_tree->numnodes = 0; p_tree->numnodes = 0;
do do
{ {
n = l_nplh[l_num_levels] * l_nplv[l_num_levels]; n = (OPJ_UINT32)(l_nplh[l_num_levels] * l_nplv[l_num_levels]);
l_nplh[l_num_levels + 1] = (l_nplh[l_num_levels] + 1) / 2; l_nplh[l_num_levels + 1] = (l_nplh[l_num_levels] + 1) / 2;
l_nplv[l_num_levels + 1] = (l_nplv[l_num_levels] + 1) / 2; l_nplv[l_num_levels + 1] = (l_nplv[l_num_levels] + 1) / 2;
p_tree->numnodes += n; p_tree->numnodes += n;