diff options
| author | Antonin Descampe <antonin@gmail.com> | 2014-04-17 09:31:37 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2014-04-17 09:31:37 +0000 |
| commit | 7199d9b5d32e9974afa62243756b027fc394f860 (patch) | |
| tree | 909c03c737feed9462147776f988d0059e58a928 /src/lib/openjp2/openjpeg.c | |
| parent | d19a4ab6768c48b542c0add922eba0dcddae9ffe (diff) | |
[trunk] refactoring of rsiz, profiles, and extensions management
Diffstat (limited to 'src/lib/openjp2/openjpeg.c')
| -rw-r--r-- | src/lib/openjp2/openjpeg.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/openjp2/openjpeg.c b/src/lib/openjp2/openjpeg.c index 89bb75a5..c53604d3 100644 --- a/src/lib/openjp2/openjpeg.c +++ b/src/lib/openjp2/openjpeg.c @@ -639,10 +639,11 @@ void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *paramete if(parameters) { memset(parameters, 0, sizeof(opj_cparameters_t)); /* default coding parameters */ - parameters->cp_cinema = OPJ_OFF; + parameters->cp_cinema = OPJ_OFF; /* DEPRECATED */ + parameters->rsiz = OPJ_PROFILE_NONE; parameters->max_comp_size = 0; parameters->numresolution = 6; - parameters->cp_rsiz = OPJ_STD_RSIZ; + parameters->cp_rsiz = OPJ_STD_RSIZ; /* DEPRECATED */ parameters->cblockw_init = 64; parameters->cblockh_init = 64; parameters->prog_order = OPJ_LRCP; @@ -793,8 +794,11 @@ OPJ_BOOL OPJ_CALLCONV opj_set_MCT(opj_cparameters_t *parameters, OPJ_UINT32 l_mct_total_size = l_matrix_size + l_dc_shift_size; /* add MCT capability */ - OPJ_INT32 rsiz = (OPJ_INT32)parameters->cp_rsiz | (OPJ_INT32)OPJ_MCT; - parameters->cp_rsiz = (OPJ_RSIZ_CAPABILITIES)rsiz; + if (OPJ_IS_PART2(parameters->rsiz)) { + parameters->rsiz |= OPJ_EXTENSION_MCT; + } else { + parameters->rsiz = ((OPJ_PROFILE_PART2) | (OPJ_EXTENSION_MCT)); + } parameters->irreversible = 1; /* use array based MCT */ |