From: Matthieu Darbois <mayeut@users.noreply.github.com>
Date: Tue, 23 Dec 2014 16:03:45 +0000 (+0000)
Subject: [trunk] removed warning from convert.c
X-Git-Tag: v2.1.1~22^2~147
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33f52fb6117603cfef62eeb242ef9214f9d6f067;p=openjpeg

[trunk] removed warning from convert.c

Update  issue 442
---

diff --git a/src/bin/jp2/convert.c b/src/bin/jp2/convert.c
index 4273141f..e6346ea9 100644
--- a/src/bin/jp2/convert.c
+++ b/src/bin/jp2/convert.c
@@ -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;
 	if (component->sgnd) {
-		OPJ_INT64  newMax = (1U << (precision - 1));
-		OPJ_INT64  oldMax = (1U << (component->prec - 1));
+		OPJ_INT64  newMax = (OPJ_INT64)(1U << (precision - 1));
+		OPJ_INT64  oldMax = (OPJ_INT64)(1U << (component->prec - 1));
 		OPJ_INT32* l_data = component->data;
 		for (i = 0; i < len; ++i) {
 			l_data[i] = (OPJ_INT32)(((OPJ_INT64)l_data[i] * newMax) / oldMax);
 		}
 	} else {
-		OPJ_UINT64  newMax = (1U << precision) - 1U;
-		OPJ_UINT64  oldMax = (1U << component->prec) - 1U;
+		OPJ_UINT64  newMax = (OPJ_UINT64)((1U << precision) - 1U);
+		OPJ_UINT64  oldMax = (OPJ_UINT64)((1U << component->prec) - 1U);
 		OPJ_UINT32* l_data = (OPJ_UINT32*)component->data;
 		for (i = 0; i < len; ++i) {
 			l_data[i] = (OPJ_UINT32)(((OPJ_UINT64)l_data[i] * newMax) / oldMax);