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

Only convert to RGB colorspace when requested

This commit is contained in:
Sébastien Lugan 2016-02-17 16:25:47 +01:00
parent 5c5ae1d51a
commit 54c534cdee
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/bin/jp2/opj_decompress.c
View File

@ -1371,16 +1371,6 @@ int main(int argc, char **argv)
else if (image->numcomps <= 2) else if (image->numcomps <= 2)
image->color_space = OPJ_CLRSPC_GRAY; image->color_space = OPJ_CLRSPC_GRAY;
if(image->color_space == OPJ_CLRSPC_SYCC){
color_sycc_to_rgb(image);
}
else if((image->color_space == OPJ_CLRSPC_CMYK) && (parameters.cod_format != TIF_DFMT)){
color_cmyk_to_rgb(image);
}
else if(image->color_space == OPJ_CLRSPC_EYCC){
color_esycc_to_rgb(image);
}
if(image->icc_profile_buf) { if(image->icc_profile_buf) {
#if defined(OPJ_HAVE_LIBLCMS1) || defined(OPJ_HAVE_LIBLCMS2) #if defined(OPJ_HAVE_LIBLCMS1) || defined(OPJ_HAVE_LIBLCMS2)
if(image->icc_profile_len) if(image->icc_profile_len)
@ -1443,6 +1433,16 @@ int main(int argc, char **argv)
if (parameters.force_rgb) if (parameters.force_rgb)
{ {
switch (image->color_space) { switch (image->color_space) {
case OPJ_CLRSPC_SYCC:
color_sycc_to_rgb(image);
break;
case OPJ_CLRSPC_CMYK:
if (parameters.cod_format != TIF_DFMT)
color_cmyk_to_rgb(image);
break;
case OPJ_CLRSPC_EYCC:
color_esycc_to_rgb(image);
break;
case OPJ_CLRSPC_SRGB: case OPJ_CLRSPC_SRGB:
break; break;
case OPJ_CLRSPC_GRAY: case OPJ_CLRSPC_GRAY: