[trunk] rename opj_setup_decoder_v2 to opj_setup_decoder

diff --git a/applications/codec/j2k_dump.c b/applications/codec/j2k_dump.c
index e908894b26e55c0c5734e93eb8c00c09867292bd..8a2688675c79dd04a783d5314df277a42fc44d49 100644 (file)
--- a/applications/codec/j2k_dump.c
+++ b/applications/codec/j2k_dump.c
@@ -532,7 +532,7 @@ int main(int argc, char *argv[])
                opj_set_error_handler(l_codec, error_callback,00);
 
                /* Setup the decoder decoding parameters using user parameters */
-               if ( !opj_setup_decoder_v2(l_codec, &parameters) ){
+               if ( !opj_setup_decoder(l_codec, &parameters) ){
                        fprintf(stderr, "ERROR -> j2k_dump: failed to setup the decoder\n");
                        opj_stream_destroy(l_stream);
                        fclose(fsrc);

diff --git a/applications/codec/j2k_to_image.c b/applications/codec/j2k_to_image.c
index bb2ff4639fda279a624c20b5f173a38e47eddf54..88917352065819c860b64f45af0fff61bf67f1ec 100644 (file)
--- a/applications/codec/j2k_to_image.c
+++ b/applications/codec/j2k_to_image.c
@@ -786,7 +786,7 @@ int main(int argc, char **argv)
                opj_set_error_handler(l_codec, error_callback,00);
 
                /* Setup the decoder decoding parameters using user parameters */
-               if ( !opj_setup_decoder_v2(l_codec, &parameters) ){
+               if ( !opj_setup_decoder(l_codec, &parameters) ){
                        fprintf(stderr, "ERROR -> j2k_dump: failed to setup the decoder\n");
                        opj_stream_destroy(l_stream);
                        fclose(fsrc);

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 04f8316571007acf9831f5ec975df1aefc705af2..91dcfbbbe9df9502c1e9f7bcc4854b9d842dc636 100644 (file)
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -457,9 +457,9 @@ void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *paramete
        }
 }
 
-opj_bool OPJ_CALLCONV opj_setup_decoder_v2(    opj_codec_t *p_codec, 
-                                                                                       opj_dparameters_t *parameters 
-                                                                                       )
+opj_bool OPJ_CALLCONV opj_setup_decoder(opj_codec_t *p_codec,
+                                        opj_dparameters_t *parameters 
+                                                                               )
 {
        if (p_codec && parameters) { 
                opj_codec_private_t * l_codec = (opj_codec_private_t *) p_codec;

diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index 0b401ba266457599d2e6db58c9af037fc81a2a19..108c50712136245dea79b6759a8d4463d270f9f8 100644 (file)
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -1230,8 +1230,8 @@ OPJ_API void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *
  *
  * @return true                        if the decoder is correctly set
  */
-OPJ_API opj_bool OPJ_CALLCONV opj_setup_decoder_v2(    opj_codec_t *p_codec,
-                                                                                                       opj_dparameters_t *parameters );
+OPJ_API opj_bool OPJ_CALLCONV opj_setup_decoder(opj_codec_t *p_codec,
+                                                                                               opj_dparameters_t *parameters );
 
 /**
  * Decodes an image header.

diff --git a/tests/j2k_random_tile_access.c b/tests/j2k_random_tile_access.c
index fa08370522af48082da57cfc11ab5e8017f1b48b..123207f98b21c7e0d3aec7e63d6ab1db62ab2ba2 100644 (file)
--- a/tests/j2k_random_tile_access.c
+++ b/tests/j2k_random_tile_access.c
@@ -230,7 +230,7 @@ int main(int argc, char **argv)
        }
 
        /* Setup the decoder decoding parameters using user parameters */
-       if ( !opj_setup_decoder_v2(l_codec, &parameters) ){
+       if ( !opj_setup_decoder(l_codec, &parameters) ){
                fprintf(stderr, "ERROR -> j2k_dump: failed to setup the decoder\n");
                opj_stream_destroy(l_stream);
                fclose(fsrc);

diff --git a/tests/test_tile_decoder.c b/tests/test_tile_decoder.c
index 45b620ae63fa407e9f01990c27c45d033f42669c..84293586a1c21930372bf9a28e5f484a6f6a306f 100644 (file)
--- a/tests/test_tile_decoder.c
+++ b/tests/test_tile_decoder.c
@@ -281,7 +281,7 @@ int main (int argc, char *argv[])
        opj_set_error_handler(l_codec, error_callback,00);
        
     /* Setup the decoder decoding parameters using user parameters */
-       if (! opj_setup_decoder_v2(l_codec, &l_param))
+       if (! opj_setup_decoder(l_codec, &l_param))
        {
         fprintf(stderr, "ERROR -> j2k_dump: failed to setup the decoder\n");
         fclose(l_file);