rename j2k_decode_v2 to opj_j2k_decode

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index 3f94d24a4d6c2e1feeb023576ff0127d323d6230..14b9be2cde6e47e14d325365bd83ac0aebf5eccb 100644 (file)
--- 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 439477b5df04c928faa48eb318c9ef46f0b28e60..f3c9f2d43579513b4e15920e545b73bbb6ff2d7e 100644 (file)
--- 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 73596295282c482fadb6a030d42ae005d32cbf4c..cde7c08ff2d12c60419b45e878076367d066ff15 100644 (file)
--- 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 591385196e55e11072bbb0360ad134bd0eaed9b9..71076ff4c4fb9c9d6754b44ee5fd16bcf85bfe6e 100644 (file)
--- 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 *,