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

[trunk] removed warning from convert.c 

Update  issue 442
This commit is contained in:
Matthieu Darbois 2014-12-23 16:03:45 +00:00
parent 81abe5b3bb
commit 33f52fb611
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/jp2/convert.c
View File

@ -108,15 +108,15 @@ static void scale_component_up(opj_image_comp_t* component, OPJ_UINT32 precision
len = (OPJ_SIZE_T)component->w * (OPJ_SIZE_T)component->h; len = (OPJ_SIZE_T)component->w * (OPJ_SIZE_T)component->h;
if (component->sgnd) { if (component->sgnd) {
OPJ_INT64 newMax = (1U << (precision - 1)); OPJ_INT64 newMax = (OPJ_INT64)(1U << (precision - 1));
OPJ_INT64 oldMax = (1U << (component->prec - 1)); OPJ_INT64 oldMax = (OPJ_INT64)(1U << (component->prec - 1));
OPJ_INT32* l_data = component->data; OPJ_INT32* l_data = component->data;
for (i = 0; i < len; ++i) { for (i = 0; i < len; ++i) {
l_data[i] = (OPJ_INT32)(((OPJ_INT64)l_data[i] * newMax) / oldMax); l_data[i] = (OPJ_INT32)(((OPJ_INT64)l_data[i] * newMax) / oldMax);
} }
} else { } else {
OPJ_UINT64 newMax = (1U << precision) - 1U; OPJ_UINT64 newMax = (OPJ_UINT64)((1U << precision) - 1U);
OPJ_UINT64 oldMax = (1U << component->prec) - 1U; OPJ_UINT64 oldMax = (OPJ_UINT64)((1U << component->prec) - 1U);
OPJ_UINT32* l_data = (OPJ_UINT32*)component->data; OPJ_UINT32* l_data = (OPJ_UINT32*)component->data;
for (i = 0; i < len; ++i) { for (i = 0; i < len; ++i) {
l_data[i] = (OPJ_UINT32)(((OPJ_UINT64)l_data[i] * newMax) / oldMax); l_data[i] = (OPJ_UINT32)(((OPJ_UINT64)l_data[i] * newMax) / oldMax);