diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 12:31:46 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 12:31:46 +0000 |
| commit | 459db3d64b38321dabd6b7ecc2ba1b7508ecae6a (patch) | |
| tree | f8ec96e6faf2861dedf627ba87940bf10281585e | |
| parent | d009cf618a8c7d34bd53969b0f0b4a20737ada22 (diff) | |
remove deprecated v1 style function opj_setup_encoder
| -rw-r--r-- | libopenjpeg/openjpeg.c | 38 | ||||
| -rw-r--r-- | libopenjpeg/openjpeg.h | 14 |
2 files changed, 0 insertions, 52 deletions
diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index 7a92a307..2f1514cc 100644 --- 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 e5689102..fe591aad 100644 --- a/libopenjpeg/openjpeg.h +++ b/libopenjpeg/openjpeg.h @@ -1372,12 +1372,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> <li>Lossless @@ -1401,14 +1395,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 * @param parameters Compression parameters |