rename jp2_setup_decoder_v2 to opj_jp2_setup_decoder

diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index 330548c8161daf5de70cdc936ab9249251e4343d..eea469ff3341bacc0bd6976dc0a5e37b816930b3 100644 (file)
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -2323,7 +2323,7 @@ void jp2_destroy_decompress(opj_jp2_t *jp2) {
 }
 
 
-void jp2_setup_decoder_v2(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters)
+void opj_jp2_setup_decoder(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters)
 {
        /* setup the J2K codec */
        j2k_setup_decoder_v2(jp2->j2k, parameters);

diff --git a/libopenjpeg/jp2.h b/libopenjpeg/jp2.h
index 714ace0462de5b4d2fa6689eda836a85cac08a8f..e546633254752cecca038841497832e59e45802d 100644 (file)
--- a/libopenjpeg/jp2.h
+++ b/libopenjpeg/jp2.h
@@ -298,7 +298,7 @@ Decoding parameters are returned in jp2->j2k->cp.
 @param jp2 JP2 decompressor handle
 @param parameters decompression parameters
 */
-void jp2_setup_decoder_v2(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters);
+void opj_jp2_setup_decoder(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters);
 /**
 Decode an image from a JPEG-2000 file stream
 @param jp2 JP2 decompressor handle

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 49f379d8796ff0783a9bb6bf96e56b4dbae7ed88..5c06bc41218f027df710d625ea354ef25f7f3b96 100644 (file)
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -390,7 +390,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format)
 
                        l_codec->m_codec_data.m_decompression.opj_destroy = (void (*) (void *))jp2_destroy;
 
-                       l_codec->m_codec_data.m_decompression.opj_setup_decoder = (void (*) (void * ,opj_dparameters_t * )) jp2_setup_decoder_v2;
+                       l_codec->m_codec_data.m_decompression.opj_setup_decoder = (void (*) (void * ,opj_dparameters_t * )) opj_jp2_setup_decoder;
 
                        l_codec->m_codec_data.m_decompression.opj_set_decode_area = (opj_bool (*) (void *,opj_image_t*, OPJ_INT32,OPJ_INT32,OPJ_INT32,OPJ_INT32, struct opj_event_mgr * )) jp2_set_decode_area;