remove deprecated v1 style function opj_decode and opj_decode_with_info

[openjpeg.git] / libopenjpeg / openjpeg.h

diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index 11ef06b23e4187630d06bed88406ff271d62cdf5..80bffaca50c3c7bef7d2d0fc1c1f81f0f5319ea8 100644 (file)
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -1191,7 +1191,6 @@ DEPRECATED( OPJ_API opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_p
 ==========================================================
 */
 
-
 /**
  * Creates a J2K/JP2 decompression structure
  * @param format               Decoder to select
@@ -1200,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
  *
@@ -1228,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.
@@ -1246,8 +1230,8 @@ DEPRECATED( OPJ_API void OPJ_CALLCONV opj_setup_decoder(opj_dinfo_t *dinfo, opj_
  *
  * @return true                        if the decoder is correctly set
  */
-OPJ_API opj_bool OPJ_CALLCONV opj_setup_decoder_v2(    opj_codec_t *p_codec,
-                                                                                                       opj_dparameters_t *parameters );
+OPJ_API opj_bool OPJ_CALLCONV opj_setup_decoder(opj_codec_t *p_codec,
+                                                                                               opj_dparameters_t *parameters );
 
 /**
  * Decodes an image header.
@@ -1278,14 +1262,6 @@ OPJ_API opj_bool OPJ_CALLCONV opj_set_decode_area(       opj_codec_t *p_codec,
                                                                                                        OPJ_INT32 p_start_x, OPJ_INT32 p_start_y,
                                                                                                        OPJ_INT32 p_end_x, OPJ_INT32 p_end_y );
 
-/**
-Decode an image from a JPEG-2000 codestream 
-@param dinfo decompressor handle
-@param cio Input buffer stream
-@return Returns a decoded image if successful, returns NULL otherwise
-*/
-DEPRECATED( OPJ_API opj_image_t* OPJ_CALLCONV opj_decode(opj_dinfo_t *dinfo, opj_cio_t *cio) );
-
 /**
  * Decode an image from a JPEG-2000 codestream
  * @param p_decompressor       decompressor handle
@@ -1386,15 +1362,6 @@ OPJ_API opj_bool OPJ_CALLCONV opj_decode_tile_data(      opj_codec_t *p_codec,
                                                                                                        OPJ_UINT32 p_data_size,
                                                                                                        opj_stream_t *p_stream );
 
-/**
-Decode an image from a JPEG-2000 codestream and extract the codestream information
-@param dinfo decompressor handle
-@param cio Input buffer stream
-@param cstr_info Codestream information structure if needed afterwards, NULL otherwise
-@return Returns a decoded image if successful, returns NULL otherwise
-*/
-DEPRECATED( OPJ_API opj_image_t* OPJ_CALLCONV opj_decode_with_info(opj_dinfo_t *dinfo, opj_cio_t *cio, opj_codestream_info_t *cstr_info) );
-
 /* COMPRESSION FUNCTIONS*/
 
 /**