[trunk] remove deprecated v1 style function opj_destroy_decompress

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 34a234f56f87563eda722b3a16511bfe640f99a3..fb63f3863c8ee01aaf91d496e2c36b546cce902f 100644 (file)
--- 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 6473b2c8a89c19b001b4cc246457a7900ae69e49..711e9a2cde37b991a24f6f257cc1e9c09f27665d 100644 (file)
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -1199,12 +1199,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
  *