rename j2k_setup_decoder_v2 to opj_j2k_setup_decoder

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index 5166ce8f58eb3965885355ca9fb6735ba609a5ec..509b627fadb44f3a91b2de1b79e70898884a83a3 100644 (file)
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -7674,7 +7674,7 @@ void j2k_destroy_decompress(opj_j2k_t *j2k) {
 }
 
 
-void j2k_setup_decoder_v2(opj_j2k_v2_t *j2k, opj_dparameters_t *parameters)
+void opj_j2k_setup_decoder(opj_j2k_v2_t *j2k, opj_dparameters_t *parameters)
 {
        if(j2k && parameters) {
                j2k->m_cp.m_specific_param.m_dec.m_layer = parameters->cp_layer;

diff --git a/libopenjpeg/j2k.h b/libopenjpeg/j2k.h
index 28d139740fd22015c52ac05d386d3609bed5c067..2658f699b11b985655b58cb06ebd848ecc9a7f3b 100644 (file)
--- a/libopenjpeg/j2k.h
+++ b/libopenjpeg/j2k.h
@@ -790,7 +790,7 @@ Decoding parameters are returned in j2k->cp.
 @param j2k J2K decompressor handle
 @param parameters decompression parameters
 */
-void j2k_setup_decoder_v2(opj_j2k_v2_t *j2k, opj_dparameters_t *parameters);
+void opj_j2k_setup_decoder(opj_j2k_v2_t *j2k, opj_dparameters_t *parameters);
 
 /**
 Decode an image from a JPEG-2000 codestream

diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index 58c70b2433d156774973c60a1f7fdee90990944b..73596295282c482fadb6a030d42ae005d32cbf4c 100644 (file)
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -2246,7 +2246,7 @@ void jp2_destroy_decompress(opj_jp2_t *jp2) {
 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);
+       opj_j2k_setup_decoder(jp2->j2k, parameters);
 
        /* further JP2 initializations go here */
        jp2->color.jp2_has_colr = 0;

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index fc77b00eba0b1066dcba1f69447e695303f75073..591385196e55e11072bbb0360ad134bd0eaed9b9 100644 (file)
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -313,7 +313,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format)
                                        (void (*) (void *))j2k_destroy;
 
                        l_codec->m_codec_data.m_decompression.opj_setup_decoder =
-                                       (void (*) (void * , opj_dparameters_t * )) j2k_setup_decoder_v2;
+                                       (void (*) (void * , opj_dparameters_t * )) opj_j2k_setup_decoder;
 
                        l_codec->m_codec_data.m_decompression.opj_read_tile_header =
                                        (opj_bool (*) ( void *,