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

[trunk] add the support of the flag ignore_pclr_cmap_cdef into the V2 jp2 functions (but not for box reading); no tests modified

This commit is contained in:
Mickael Savinaud 2012-08-09 14:28:35 +00:00
parent 4397b675cb
commit 8e5070f469
2 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
libopenjpeg/jp2.c
View File

@ -1776,34 +1776,37 @@ opj_bool jp2_decode_v2( opj_jp2_v2_t *jp2,
return OPJ_FALSE; return OPJ_FALSE;
} }
/* Set Image Color Space */ if (!jp2->ignore_pclr_cmap_cdef){
if (jp2->enumcs == 16)
p_image->color_space = CLRSPC_SRGB;
else if (jp2->enumcs == 17)
p_image->color_space = CLRSPC_GRAY;
else if (jp2->enumcs == 18)
p_image->color_space = CLRSPC_SYCC;
else
p_image->color_space = CLRSPC_UNKNOWN;
/* Apply the color space if needed */ /* Set Image Color Space */
if(jp2->color.jp2_cdef) { if (jp2->enumcs == 16)
jp2_apply_cdef(p_image, &(jp2->color)); p_image->color_space = CLRSPC_SRGB;
} else if (jp2->enumcs == 17)
p_image->color_space = CLRSPC_GRAY;
else if (jp2->enumcs == 18)
p_image->color_space = CLRSPC_SYCC;
else
p_image->color_space = CLRSPC_UNKNOWN;
if(jp2->color.jp2_pclr) { /* Apply the color space if needed */
/* Part 1, I.5.3.4: Either both or none : */ if(jp2->color.jp2_cdef) {
if( !jp2->color.jp2_pclr->cmap) jp2_apply_cdef(p_image, &(jp2->color));
jp2_free_pclr(&(jp2->color)); }
else
jp2_apply_pclr(p_image, &(jp2->color));
}
if(jp2->color.icc_profile_buf) { if(jp2->color.jp2_pclr) {
p_image->icc_profile_buf = jp2->color.icc_profile_buf; /* Part 1, I.5.3.4: Either both or none : */
p_image->icc_profile_len = jp2->color.icc_profile_len; if( !jp2->color.jp2_pclr->cmap)
jp2->color.icc_profile_buf = NULL; jp2_free_pclr(&(jp2->color));
} else
jp2_apply_pclr(p_image, &(jp2->color));
}
if(jp2->color.icc_profile_buf) {
p_image->icc_profile_buf = jp2->color.icc_profile_buf;
p_image->icc_profile_len = jp2->color.icc_profile_len;
jp2->color.icc_profile_buf = NULL;
}
}
return OPJ_TRUE; return OPJ_TRUE;
} }
@ -2319,12 +2322,6 @@ void jp2_destroy_decompress(opj_jp2_t *jp2) {
} }
} }
void jp2_setup_decoder(opj_jp2_t *jp2, opj_dparameters_t *parameters) {
/* setup the J2K codec */
j2k_setup_decoder(jp2->j2k, parameters);
/* further JP2 initializations go here */
jp2->ignore_pclr_cmap_cdef = parameters->flags & OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
}
void jp2_setup_decoder_v2(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters) void jp2_setup_decoder_v2(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters)
{ {
@ -2333,6 +2330,7 @@ void jp2_setup_decoder_v2(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters)
/* further JP2 initializations go here */ /* further JP2 initializations go here */
jp2->color.jp2_has_colr = 0; jp2->color.jp2_has_colr = 0;
jp2->ignore_pclr_cmap_cdef = parameters->flags & OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
} }

1
libopenjpeg/jp2.h
View File

@ -215,6 +215,7 @@ typedef struct opj_jp2_v2
opj_jp2_color_t color; opj_jp2_color_t color;
opj_bool ignore_pclr_cmap_cdef;
} }
opj_jp2_v2_t; opj_jp2_v2_t;