From 6767ea24561fb4ac7137bc5734dc4befcdc830aa Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 9 Aug 2012 12:35:13 +0000 Subject: [trunk] rename opj_setup_encoder_v2 to opj_setup_encoder --- libopenjpeg/openjpeg.c | 6 +++--- libopenjpeg/openjpeg.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libopenjpeg') diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index 2f1514cc..3954ddcd 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -673,9 +673,9 @@ opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream ( FILE * p_file, return l_stream; } -opj_bool OPJ_CALLCONV opj_setup_encoder_v2( opj_codec_t *p_codec, - opj_cparameters_t *parameters, - opj_image_t *p_image) +opj_bool OPJ_CALLCONV opj_setup_encoder(opj_codec_t *p_codec, + opj_cparameters_t *parameters, + opj_image_t *p_image) { if (p_codec && parameters && p_image) { opj_codec_private_t * l_codec = (opj_codec_private_t *) p_codec; diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h index fe591aad..e3ee72a6 100644 --- a/libopenjpeg/openjpeg.h +++ b/libopenjpeg/openjpeg.h @@ -1400,9 +1400,9 @@ OPJ_API void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t * * @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); /** */ -- cgit v1.2.3