From 76d39b7e9b1c565f0222bcc07d9ab0e1ce415c87 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 15 May 2024 23:26:37 +1000 Subject: [PATCH 1/2] Support setting enumcs for CMYK and EYCC color space --- src/lib/openjp2/jp2.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c index 6015190e1..1aa793b88 100644 --- a/src/lib/openjp2/jp2.c +++ b/src/lib/openjp2/jp2.c @@ -1995,6 +1995,10 @@ OPJ_BOOL opj_jp2_setup_encoder(opj_jp2_t *jp2, jp2->enumcs = 17; /* greyscale */ } else if (image->color_space == 3) { jp2->enumcs = 18; /* YUV */ + } else if (image->color_space == 4) { + jp2->enumcs = 24; /* EYCC */ + } else if (image->color_space == 5) { + jp2->enumcs = 12; /* CMYK */ } } From 4f7babec7969d590823ab582fb537ef6857a34a0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 14 Jun 2024 21:28:19 +1000 Subject: [PATCH 2/2] Use enums --- src/lib/openjp2/jp2.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c index 1aa793b88..4df055a54 100644 --- a/src/lib/openjp2/jp2.c +++ b/src/lib/openjp2/jp2.c @@ -1989,16 +1989,16 @@ OPJ_BOOL opj_jp2_setup_encoder(opj_jp2_t *jp2, jp2->enumcs = 0; } else { jp2->meth = 1; - if (image->color_space == 1) { + if (image->color_space == OPJ_CLRSPC_SRGB) { jp2->enumcs = 16; /* sRGB as defined by IEC 61966-2-1 */ - } else if (image->color_space == 2) { - jp2->enumcs = 17; /* greyscale */ - } else if (image->color_space == 3) { + } else if (image->color_space == OPJ_CLRSPC_GRAY) { + jp2->enumcs = 17; + } else if (image->color_space == OPJ_CLRSPC_SYCC) { jp2->enumcs = 18; /* YUV */ - } else if (image->color_space == 4) { - jp2->enumcs = 24; /* EYCC */ - } else if (image->color_space == 5) { - jp2->enumcs = 12; /* CMYK */ + } else if (image->color_space == OPJ_CLRSPC_EYCC) { + jp2->enumcs = 24; + } else if (image->color_space == OPJ_CLRSPC_CMYK) { + jp2->enumcs = 12; } }