From 10e9a6b6cdf0959120bfb85df95b85999f7b65f7 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 9 Aug 2012 15:16:33 +0000 Subject: [PATCH] rename j2k_decode_v2 to opj_j2k_decode --- libopenjpeg/j2k.c | 2 +- libopenjpeg/j2k.h | 5 ++++- libopenjpeg/jp2.c | 2 +- libopenjpeg/openjpeg.c | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index 3f94d24a..14b9be2c 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -11723,7 +11723,7 @@ static void j2k_setup_decoding_tile (opj_j2k_v2_t *p_j2k) /** * Decodes the tiles of the stream. */ -opj_bool j2k_decode_v2( opj_j2k_v2_t * p_j2k, +opj_bool opj_j2k_decode(opj_j2k_v2_t * p_j2k, opj_stream_private_t * p_stream, opj_image_t * p_image, opj_event_mgr_t * p_manager) diff --git a/libopenjpeg/j2k.h b/libopenjpeg/j2k.h index 439477b5..f3c9f2d4 100644 --- a/libopenjpeg/j2k.h +++ b/libopenjpeg/j2k.h @@ -1004,7 +1004,10 @@ opj_codestream_index_t* j2k_get_cstr_index(opj_j2k_v2_t* p_j2k); * @param cstr_info Codestream information structure if required, NULL otherwise * @return Returns a decoded image if successful, returns NULL otherwise */ -opj_bool j2k_decode_v2(opj_j2k_v2_t *j2k, struct opj_stream_private *cio, opj_image_t* p_image, opj_event_mgr_t * p_manager); +opj_bool opj_j2k_decode(opj_j2k_v2_t *j2k, + opj_stream_private_t *p_stream, + opj_image_t *p_image, + opj_event_mgr_t *p_manager); opj_bool j2k_get_tile( opj_j2k_v2_t *p_j2k, diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c index 73596295..cde7c08f 100644 --- a/libopenjpeg/jp2.c +++ b/libopenjpeg/jp2.c @@ -1705,7 +1705,7 @@ opj_bool opj_jp2_decode(opj_jp2_v2_t *jp2, return OPJ_FALSE; /* J2K decoding */ - if( ! j2k_decode_v2(jp2->j2k, p_stream, p_image, p_manager) ) { + if( ! opj_j2k_decode(jp2->j2k, p_stream, p_image, p_manager) ) { opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to decode the codestream in the JP2 file\n"); return OPJ_FALSE; } diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index 59138519..71076ff4 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -296,7 +296,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format) l_codec->m_codec_data.m_decompression.opj_decode = (opj_bool (*) ( void *, struct opj_stream_private *, - opj_image_t*, struct opj_event_mgr * )) j2k_decode_v2; + opj_image_t*, struct opj_event_mgr * )) opj_j2k_decode; l_codec->m_codec_data.m_decompression.opj_end_decompress = (opj_bool (*) ( void *,