From 5d0ace05772d90a40bad9dc98f4bf225d3ef21a2 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 9 Aug 2012 12:42:46 +0000 Subject: [PATCH] [trunk] rename opj_encode_v2 to opj_encode --- applications/codec/image_to_j2k.c | 4 ++-- libopenjpeg/openjpeg.c | 2 +- libopenjpeg/openjpeg.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/applications/codec/image_to_j2k.c b/applications/codec/image_to_j2k.c index ca624ad7..71bafdb2 100644 --- a/applications/codec/image_to_j2k.c +++ b/applications/codec/image_to_j2k.c @@ -1861,9 +1861,9 @@ int main(int argc, char **argv) { free(l_data); } else { - bSuccess = bSuccess && opj_encode_v2(l_codec, l_stream); + bSuccess = bSuccess && opj_encode(l_codec, l_stream); if (!bSuccess) { - fprintf(stderr, "failed to encode image: opj_encode_v2\n"); + fprintf(stderr, "failed to encode image: opj_encode\n"); } } bSuccess = bSuccess && opj_end_compress(l_codec, l_stream); diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index 14b516ed..22900d12 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -675,7 +675,7 @@ opj_bool OPJ_CALLCONV opj_start_compress ( opj_codec_t *p_codec, return OPJ_FALSE; } -opj_bool OPJ_CALLCONV opj_encode_v2(opj_codec_t *p_info, opj_stream_t *p_stream) +opj_bool OPJ_CALLCONV opj_encode(opj_codec_t *p_info, opj_stream_t *p_stream) { if (p_info && p_stream) { opj_codec_private_t * l_codec = (opj_codec_private_t *) p_info; diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h index 5b8d3a81..60cdfa3f 100644 --- a/libopenjpeg/openjpeg.h +++ b/libopenjpeg/openjpeg.h @@ -1423,8 +1423,8 @@ 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); +OPJ_API opj_bool OPJ_CALLCONV opj_encode(opj_codec_t *p_codec, + opj_stream_t *p_stream); /**