remove deprecated v1 style function opj_setup_encoder

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 7a92a30721eb48e271961071ec796e4b54818ace..2f1514cc94ad6092eb6e47e02b4f3e92af931e07 100644 (file)
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -579,27 +579,6 @@ opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format)
        return (opj_codec_t*) l_codec;
 }
 
-/* DEPRECATED */
-void OPJ_CALLCONV opj_destroy_compress(opj_cinfo_t *cinfo) {
-       if(cinfo) {
-               /* destroy the codec */
-               switch(cinfo->codec_format) {
-                       case CODEC_J2K:
-                               j2k_destroy_compress((opj_j2k_t*)cinfo->j2k_handle);
-                               break;
-                       case CODEC_JP2:
-                               jp2_destroy_compress((opj_jp2_t*)cinfo->jp2_handle);
-                               break;
-                       case CODEC_JPT:
-                       case CODEC_UNKNOWN:
-                       default:
-                               break;
-               }
-               /* destroy the decompressor */
-               opj_free(cinfo);
-       }
-}
-
 void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *parameters) {
        if(parameters) {
                memset(parameters, 0, sizeof(opj_cparameters_t));
@@ -693,23 +672,6 @@ opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream ( FILE * p_file,
 
        return l_stream;
 }
-/* DEPRECATED */
-void OPJ_CALLCONV opj_setup_encoder(opj_cinfo_t *cinfo, opj_cparameters_t *parameters, opj_image_t *image) {
-       if(cinfo && parameters && image) {
-               switch(cinfo->codec_format) {
-                       case CODEC_J2K:
-                               j2k_setup_encoder((opj_j2k_t*)cinfo->j2k_handle, parameters, image);
-                               break;
-                       case CODEC_JP2:
-                               jp2_setup_encoder((opj_jp2_v2_t*)cinfo->jp2_handle, parameters, image, NULL);
-                               break;
-                       case CODEC_JPT:
-                       case CODEC_UNKNOWN:
-                       default:
-                               break;
-               }
-       }
-}
 
 opj_bool OPJ_CALLCONV opj_setup_encoder_v2(    opj_codec_t *p_codec, 
                                                                                        opj_cparameters_t *parameters, 

diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index e5689102edc1972a9aaa13c10e2b8a7b0f4552cd..fe591aad077fd8803e2c42aaeab3bf2897c959c7 100644 (file)
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -1371,12 +1371,6 @@ OPJ_API opj_bool OPJ_CALLCONV opj_decode_tile_data(      opj_codec_t *p_codec,
  */
 OPJ_API opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT format);
 
-/**
-Destroy a compressor handle
-@param cinfo compressor handle to destroy
-*/
-DEPRECATED(OPJ_API void OPJ_CALLCONV opj_destroy_compress(opj_cinfo_t *cinfo) );
-
 /**
 Set encoding parameters to default values, that means : 
 <ul>
@@ -1400,14 +1394,6 @@ Set encoding parameters to default values, that means :
 */
 OPJ_API void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *parameters);
 
-/**
-Setup the encoder parameters using the current image and using user parameters. 
-@param cinfo Compressor handle
-@param parameters Compression parameters
-@param image Input filled image
-*/
-DEPRECATED(OPJ_API void OPJ_CALLCONV opj_setup_encoder(opj_cinfo_t *cinfo, opj_cparameters_t *parameters, opj_image_t *image) );
-
 /**
  * Setup the encoder parameters using the current image and using user parameters.
  * @param p_codec              Compressor handle