remove deprecated v1 style function opj_destroy_cstr_info

[openjpeg.git] / libopenjpeg / openjpeg.h

diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index 108c50712136245dea79b6759a8d4463d270f9f8..dab9140295ae5dbe1505c53fa9f2ac09922a94eb 100644 (file)
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -1262,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
@@ -1277,9 +1269,9 @@ DEPRECATED( OPJ_API opj_image_t* OPJ_CALLCONV opj_decode(opj_dinfo_t *dinfo, opj
  * @param p_image                      the decoded image
  * @return                                     true if success, otherwise false
  * */
-OPJ_API opj_bool OPJ_CALLCONV opj_decode_v2(opj_codec_t *p_decompressor,
-                                                                                       opj_stream_t *p_stream,
-                                                                                       opj_image_t *p_image);
+OPJ_API opj_bool OPJ_CALLCONV opj_decode(   opj_codec_t *p_decompressor,
+                                            opj_stream_t *p_stream,
+                                            opj_image_t *p_image);
 
 /**
  * Get the decoded tile from the codec
@@ -1370,36 +1362,14 @@ 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*/
 
-/**
-Creates a J2K/JP2 compression structure
-@param format Coder to select
-@return Returns a handle to a compressor if successful, returns NULL otherwise
-*/
-DEPRECATED( OPJ_API opj_cinfo_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT format));
-
 /**
  * Creates a J2K/JP2 compression structure
  * @param      format          Coder to select
  * @return                             Returns a handle to a compressor if successful, returns NULL otherwise
  */
-OPJ_API opj_codec_t* OPJ_CALLCONV opj_create_compress_v2(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) );
+OPJ_API opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT format);
 
 /**
 Set encoding parameters to default values, that means : 
@@ -1424,23 +1394,15 @@ 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
  * @param image                Input filled image
  */
-OPJ_API opj_bool OPJ_CALLCONV opj_setup_encoder_v2(    opj_codec_t *p_codec, 
-                                                                                                       opj_cparameters_t *parameters, 
-                                                                                                       opj_image_t *image);
+OPJ_API opj_bool OPJ_CALLCONV opj_setup_encoder(opj_codec_t *p_codec, 
+                                                                                               opj_cparameters_t *parameters, 
+                                                                                               opj_image_t *image);
 
 /**
  */
@@ -1461,35 +1423,14 @@ OPJ_API opj_bool OPJ_CALLCONV opj_end_compress (opj_codec_t *p_codec,
  *
  * @return                             Returns true if successful, returns false otherwise
  */
-OPJ_API opj_bool OPJ_CALLCONV opj_encode_v2(opj_codec_t *p_codec, 
-                                                                                       opj_stream_t *p_stream);
-
-/**
-Encode an image into a JPEG-2000 codestream
-3@param cinfo compressor handle
-@param cio Output buffer stream
-@param image Image to encode
-@param index Depreacted -> Set to NULL. To extract index, used opj_encode_wci()
-@return Returns true if successful, returns false otherwise
-*/
-DEPRECATED( OPJ_API opj_bool OPJ_CALLCONV opj_encode(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, char *index) );
-/**
-Encode an image into a JPEG-2000 codestream and extract the codestream information
-@param cinfo compressor handle
-@param cio Output buffer stream
-@param image Image to encode
-@param cstr_info Codestream information structure if needed afterwards, NULL otherwise
-@return Returns true if successful, returns false otherwise
-*/
-DEPRECATED( OPJ_API opj_bool OPJ_CALLCONV opj_encode_with_info(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info) );
+OPJ_API opj_bool OPJ_CALLCONV opj_encode(opj_codec_t *p_codec, 
+                                         opj_stream_t *p_stream);
 
 
 /**
 Destroy Codestream information after compression or decompression
 @param cstr_info Codestream information structure
 */
-OPJ_API void OPJ_CALLCONV opj_destroy_cstr_info(opj_codestream_info_t *cstr_info);
-
 OPJ_API void OPJ_CALLCONV opj_destroy_cstr_info_v2(opj_codestream_info_v2_t **cstr_info);