From d009cf618a8c7d34bd53969b0f0b4a20737ada22 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 9 Aug 2012 12:28:51 +0000 Subject: [PATCH] rename opj_create_compress_v2 to opj_create_compress --- applications/codec/image_to_j2k.c | 4 ++-- libopenjpeg/openjpeg.c | 2 +- libopenjpeg/openjpeg.h | 2 +- tests/test_tile_encoder.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/applications/codec/image_to_j2k.c b/applications/codec/image_to_j2k.c index 7f512003..03de5f23 100644 --- a/applications/codec/image_to_j2k.c +++ b/applications/codec/image_to_j2k.c @@ -1794,13 +1794,13 @@ int main(int argc, char **argv) { case J2K_CFMT: /* JPEG-2000 codestream */ { /* Get a decoder handle */ - l_codec = opj_create_compress_v2(CODEC_J2K); + l_codec = opj_create_compress(CODEC_J2K); break; } case JP2_CFMT: /* JPEG 2000 compressed image data */ { /* Get a decoder handle */ - l_codec = opj_create_compress_v2(CODEC_JP2); + l_codec = opj_create_compress(CODEC_JP2); break; } default: diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index 05c50d97..7a92a307 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -482,7 +482,7 @@ opj_bool OPJ_CALLCONV opj_setup_decoder(opj_codec_t *p_codec, /* ---------------------------------------------------------------------- */ /* COMPRESSION FUNCTIONS*/ -opj_codec_t* OPJ_CALLCONV opj_create_compress_v2(OPJ_CODEC_FORMAT p_format) +opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format) { opj_codec_private_t *l_codec = 00; diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h index 8e476e30..e5689102 100644 --- a/libopenjpeg/openjpeg.h +++ b/libopenjpeg/openjpeg.h @@ -1369,7 +1369,7 @@ OPJ_API opj_bool OPJ_CALLCONV opj_decode_tile_data( opj_codec_t *p_codec, * @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); +OPJ_API opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT format); /** Destroy a compressor handle diff --git a/tests/test_tile_encoder.c b/tests/test_tile_encoder.c index ea0b5a4d..ea57d269 100644 --- a/tests/test_tile_encoder.c +++ b/tests/test_tile_encoder.c @@ -244,11 +244,11 @@ int main (int argc, char *argv[]) len = strlen( output_file ); if( strcmp( output_file + len - 4, ".jp2" ) == 0 ) { - l_codec = opj_create_compress_v2(CODEC_JP2); + l_codec = opj_create_compress(CODEC_JP2); } else { - l_codec = opj_create_compress_v2(CODEC_J2K); + l_codec = opj_create_compress(CODEC_J2K); } if (!l_codec) { return 1;