rename jp2_decode_v2 to opj_jp2_decode

diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index 77b6c38db64122e3d5d4225fec9db7b2dee0ce2f..307f53abd0619e49daab2f78ab09ae9b9d6ae2ef 100644 (file)
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -1696,16 +1696,16 @@ opj_bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_color_t *color)
 
 
 
-opj_bool jp2_decode_v2(        opj_jp2_v2_t *jp2,
-                                               struct opj_stream_private *cio,
-                                               opj_image_t* p_image,
-                                               struct opj_event_mgr * p_manager)
+opj_bool opj_jp2_decode(opj_jp2_v2_t *jp2,
+                        opj_stream_private_t *p_stream,
+                        opj_image_t* p_image,
+                        opj_event_mgr_t * p_manager)
 {
        if (!p_image)
                return OPJ_FALSE;
 
        /* J2K decoding */
-       if( ! j2k_decode_v2(jp2->j2k, cio, p_image, p_manager) ) {
+       if( ! j2k_decode_v2(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/jp2.h b/libopenjpeg/jp2.h
index 89c334fcca45ea9cadd9869a55ba07702fdb2747..5119ec37752c128b5844c71199f63d3e3cd2bab4 100644 (file)
--- a/libopenjpeg/jp2.h
+++ b/libopenjpeg/jp2.h
@@ -307,10 +307,10 @@ void opj_jp2_setup_decoder(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters);
  * @param cstr_info Codestream information structure if required, NULL otherwise
  * @return Returns a decoded image if successful, returns NULL otherwise
 */
-opj_bool jp2_decode_v2(        opj_jp2_v2_t *jp2,
-                                               struct opj_stream_private *cio,
+opj_bool opj_jp2_decode(opj_jp2_v2_t *jp2,
+                        opj_stream_private_t *p_stream,
                                                opj_image_t* p_image,
-                                               struct opj_event_mgr * p_manager);
+                                               opj_event_mgr_t * p_manager);
 
 
 /**

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 5c06bc41218f027df710d625ea354ef25f7f3b96..c1d2874d0829f47c3319a281f9c8bc616029de1d 100644 (file)
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -363,7 +363,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format)
                                        (opj_bool (*) ( void *,
                                                                        struct opj_stream_private *,
                                                                        opj_image_t*,
-                                                                       struct opj_event_mgr * )) jp2_decode_v2;
+                                                                       struct opj_event_mgr * )) opj_jp2_decode;
 
                        l_codec->m_codec_data.m_decompression.opj_end_decompress =  (opj_bool (*) (void *,struct opj_stream_private *,struct opj_event_mgr *)) jp2_end_decompress;