diff options
| author | Matthieu Darbois <mayeut@users.noreply.github.com> | 2015-08-21 21:44:05 +0200 |
|---|---|---|
| committer | Matthieu Darbois <mayeut@users.noreply.github.com> | 2015-08-21 21:44:05 +0200 |
| commit | 589cc547b9f32afe7832665f3ec26e73e3452772 (patch) | |
| tree | e3f7ec3c69f4d9c4a72db4591dd7a895ee94046d /src/bin/common | |
| parent | d4ac2f613ddc7b28f60df16aa5072647408891ce (diff) | |
| parent | a5214724270a709a3cf48a4b22a052a60c651141 (diff) | |
Merge pull request #567 from mayeut/master
Add tests for CMYK/esYCC/CIELab
Diffstat (limited to 'src/bin/common')
| -rw-r--r-- | src/bin/common/color.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/common/color.c b/src/bin/common/color.c index a3a2abab..d662f995 100644 --- a/src/bin/common/color.c +++ b/src/bin/common/color.c @@ -569,7 +569,7 @@ void color_apply_conversion(opj_image_t *image) image->color_space = OPJ_CLRSPC_SRGB; - numcomps = image->numcomps; + numcomps = (int)image->numcomps; if(numcomps != 3) { @@ -615,7 +615,7 @@ void color_apply_conversion(opj_image_t *image) prec1 = (double)image->comps[1].prec; prec2 = (double)image->comps[2].prec; - default_type = row[1]; + default_type = (unsigned int)row[1]; if(default_type == 0x44454600)// DEF : default { @@ -749,8 +749,8 @@ void color_esycc_to_rgb(opj_image_t *image) w = image->comps[0].w; h = image->comps[0].h; - sign1 = image->comps[1].sgnd; - sign2 = image->comps[2].sgnd; + sign1 = (int)image->comps[1].sgnd; + sign2 = (int)image->comps[2].sgnd; max = w * h; |