diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 11:56:14 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 11:56:14 +0000 |
| commit | b34215906c31fd1bf7ef5fd5772b43758ecc8079 (patch) | |
| tree | 6e7553ff236f1505b1ed21cbfbb3c006a72a27b9 | |
| parent | fb768ac792e82b27271d83e986f62e471139a80a (diff) | |
[trunk] remove deprecated v1 style function opj_setup_decoder
| -rw-r--r-- | libopenjpeg/openjpeg.c | 18 | ||||
| -rw-r--r-- | libopenjpeg/openjpeg.h | 9 |
2 files changed, 0 insertions, 27 deletions
diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index fb63f386..04f83165 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -457,24 +457,6 @@ void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *paramete } } -/* DEPRECATED */ -void OPJ_CALLCONV opj_setup_decoder(opj_dinfo_t *dinfo, opj_dparameters_t *parameters) { - if(dinfo && parameters) { - switch(dinfo->codec_format) { - case CODEC_J2K: - case CODEC_JPT: - j2k_setup_decoder((opj_j2k_t*)dinfo->j2k_handle, parameters); - break; - case CODEC_JP2: - jp2_setup_decoder((opj_jp2_t*)dinfo->jp2_handle, parameters); - break; - case CODEC_UNKNOWN: - default: - break; - } - } -} - opj_bool OPJ_CALLCONV opj_setup_decoder_v2( opj_codec_t *p_codec, opj_dparameters_t *parameters ) diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h index 711e9a2c..0b401ba2 100644 --- a/libopenjpeg/openjpeg.h +++ b/libopenjpeg/openjpeg.h @@ -1222,15 +1222,6 @@ OPJ_API opj_bool OPJ_CALLCONV opj_end_decompress ( opj_codec_t *p_codec, OPJ_API void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *parameters); /** -Setup the decoder decoding parameters using user parameters. -Decoding parameters are returned in j2k->cp. -@param dinfo decompressor handle -@param parameters decompression parameters -*/ -DEPRECATED( OPJ_API void OPJ_CALLCONV opj_setup_decoder(opj_dinfo_t *dinfo, opj_dparameters_t *parameters) ); - - -/** * Setup the decoder with decompression parameters provided by the user and with the message handler * provided by the user. * |