[trunk] remove deprecated v1 style function opj_setup_decoder

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index fb63f3863c8ee01aaf91d496e2c36b546cce902f..04f8316571007acf9831f5ec975df1aefc705af2 100644 (file)
--- 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 711e9a2cde37b991a24f6f257cc1e9c09f27665d..0b401ba266457599d2e6db58c9af037fc81a2a19 100644 (file)
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -1221,15 +1221,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.