summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthieu Darbois <mayeut@users.noreply.github.com>2014-11-25 20:06:12 +0000
committerMatthieu Darbois <mayeut@users.noreply.github.com>2014-11-25 20:06:12 +0000
commit63f877769cb2adb3b69575f326e09d39ea016bf9 (patch)
tree074f17c80d657f2767beddc29fae4b0868d72c58 /src
parent04c6bb4a72887636b0d5d4c7f6ce4b32100953ed (diff)
[trunk] removed some warnings when building src/bin/jp2/convert.c
Update issue 442
Diffstat (limited to 'src')
-rw-r--r--src/bin/jp2/convert.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bin/jp2/convert.c b/src/bin/jp2/convert.c
index 47d8b0be..7d317aee 100644
--- a/src/bin/jp2/convert.c
+++ b/src/bin/jp2/convert.c
@@ -112,9 +112,9 @@ void scale_component(opj_image_comp_t* component, OPJ_UINT32 precision)
return;
}
if (component->prec < precision) {
- shift = precision - component->prec;
+ shift = (int)(precision - component->prec);
} else {
- shift = component->prec - precision;
+ shift = (int)(component->prec - precision);
}
len = (OPJ_SIZE_T)component->w * (OPJ_SIZE_T)component->h;
@@ -3078,7 +3078,7 @@ static opj_image_t* rawtoimage_common(const char *filename, opj_cparameters_t *p
}
w = raw_cp->rawWidth;
h = raw_cp->rawHeight;
- cmptparm = (opj_image_cmptparm_t*) calloc(numcomps,sizeof(opj_image_cmptparm_t));
+ cmptparm = (opj_image_cmptparm_t*) calloc((OPJ_UINT32)numcomps,sizeof(opj_image_cmptparm_t));
if (!cmptparm) {
fprintf(stderr, "Failed to allocate image components parameters !!\n");
fprintf(stderr,"Aborting\n");