diff options
| author | Andrew Murray <3112309+radarhere@users.noreply.github.com> | 2024-06-14 22:21:12 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-14 14:21:12 +0200 |
| commit | 2f5a299cbae9856dccd98ed33971bac4d1283fd0 (patch) | |
| tree | 98a475783d863e711e0b6e835b048b5f6bf7c0e2 /src | |
| parent | 1bca4d2f775eba7b37b50cbaac392474dbc959d9 (diff) | |
Support setting enumcs for CMYK and EYCC color space (#1529)
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/openjp2/jp2.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c index 6015190e..4df055a5 100644 --- a/src/lib/openjp2/jp2.c +++ b/src/lib/openjp2/jp2.c @@ -1989,12 +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 == OPJ_CLRSPC_EYCC) { + jp2->enumcs = 24; + } else if (image->color_space == OPJ_CLRSPC_CMYK) { + jp2->enumcs = 12; } } |