diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 11:53:33 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 11:53:33 +0000 |
| commit | fb768ac792e82b27271d83e986f62e471139a80a (patch) | |
| tree | a81bfb2e47c19e5e7493d23ece26c1da49823b1f | |
| parent | 35289bffe2c350eae565fd982618f774ca138b57 (diff) | |
[trunk] remove deprecated v1 style function opj_destroy_decompress
| -rw-r--r-- | libopenjpeg/openjpeg.c | 21 | ||||
| -rw-r--r-- | libopenjpeg/openjpeg.h | 6 |
2 files changed, 0 insertions, 27 deletions
diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index 34a234f5..fb63f386 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -436,27 +436,6 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format) return (opj_codec_t*) l_codec; } -/* DEPRECATED */ -void OPJ_CALLCONV opj_destroy_decompress(opj_dinfo_t *dinfo) { - if(dinfo) { - /* destroy the codec */ - switch(dinfo->codec_format) { - case CODEC_J2K: - case CODEC_JPT: - j2k_destroy_decompress((opj_j2k_t*)dinfo->j2k_handle); - break; - case CODEC_JP2: - jp2_destroy_decompress((opj_jp2_t*)dinfo->jp2_handle); - break; - case CODEC_UNKNOWN: - default: - break; - } - /* destroy the decompressor */ - opj_free(dinfo); - } -} - void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *parameters) { if(parameters) { memset(parameters, 0, sizeof(opj_dparameters_t)); diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h index 6473b2c8..711e9a2c 100644 --- a/libopenjpeg/openjpeg.h +++ b/libopenjpeg/openjpeg.h @@ -1200,12 +1200,6 @@ DEPRECATED( OPJ_API opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_p OPJ_API opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT format); /** -Destroy a decompressor handle -@param dinfo decompressor handle to destroy -*/ -DEPRECATED( OPJ_API void OPJ_CALLCONV opj_destroy_decompress(opj_dinfo_t *dinfo) ); - -/** * Destroy a decompressor handle * * @param p_codec decompressor handle to destroy |