summaryrefslogtreecommitdiff
path: root/src/bin/jp2/opj_decompress.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/jp2/opj_decompress.c')
-rw-r--r--src/bin/jp2/opj_decompress.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c
index 76f592fd..ac17b69d 100644
--- a/src/bin/jp2/opj_decompress.c
+++ b/src/bin/jp2/opj_decompress.c
@@ -1359,12 +1359,10 @@ int main(int argc, char **argv)
if(image->color_space == OPJ_CLRSPC_SYCC){
color_sycc_to_rgb(image);
}
- else
- if(image->color_space == OPJ_CLRSPC_CMYK){
+ 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){
+ else if(image->color_space == OPJ_CLRSPC_EYCC){
color_esycc_to_rgb(image);
}