[trunk] rename opj_setup_encoder_v2 to opj_setup_encoder

diff --git a/applications/codec/image_to_j2k.c b/applications/codec/image_to_j2k.c
index 03de5f23b58ae01d381a23a3c3d38a185631b0f9..ca624ad70f8e18bd4ecfe148d4a1e9dbe9d5aa78 100644 (file)
--- a/applications/codec/image_to_j2k.c
+++ b/applications/codec/image_to_j2k.c
@@ -1821,7 +1821,7 @@ int main(int argc, char **argv) {
       parameters.cp_tdx = 512;
       parameters.cp_tdy = 512;
     }
-               opj_setup_encoder_v2(l_codec, &parameters, image);
+               opj_setup_encoder(l_codec, &parameters, image);
 
                /* Open the output file*/
                fout = fopen(parameters.outfile, "wb");

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 2f1514cc94ad6092eb6e47e02b4f3e92af931e07..3954ddcdc521491fe79eea6250f4f34e5bfda316 100644 (file)
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -673,9 +673,9 @@ opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream (  FILE * p_file,
        return l_stream;
 }
 
-opj_bool OPJ_CALLCONV opj_setup_encoder_v2(    opj_codec_t *p_codec, 
-                                                                                       opj_cparameters_t *parameters, 
-                                                                                       opj_image_t *p_image)
+opj_bool OPJ_CALLCONV opj_setup_encoder(opj_codec_t *p_codec, 
+                                                                               opj_cparameters_t *parameters, 
+                                                                               opj_image_t *p_image)
 {
        if (p_codec && parameters && p_image) {
                opj_codec_private_t * l_codec = (opj_codec_private_t *) p_codec;

diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index fe591aad077fd8803e2c42aaeab3bf2897c959c7..e3ee72a60673b49668242775d5858ae596ad6a14 100644 (file)
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -1400,9 +1400,9 @@ OPJ_API void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *
  * @param parameters   Compression parameters
  * @param image                Input filled image
  */
-OPJ_API opj_bool OPJ_CALLCONV opj_setup_encoder_v2(    opj_codec_t *p_codec, 
-                                                                                                       opj_cparameters_t *parameters, 
-                                                                                                       opj_image_t *image);
+OPJ_API opj_bool OPJ_CALLCONV opj_setup_encoder(opj_codec_t *p_codec, 
+                                                                                               opj_cparameters_t *parameters, 
+                                                                                               opj_image_t *image);
 
 /**
  */

diff --git a/tests/test_tile_encoder.c b/tests/test_tile_encoder.c
index ea57d269b7a5962653da561160197652b601a76a..e1d93b3da19d51c14cff7b2a89941d95e9a01c05 100644 (file)
--- a/tests/test_tile_encoder.c
+++ b/tests/test_tile_encoder.c
@@ -271,7 +271,7 @@ int main (int argc, char *argv[])
        l_image->y1 = image_height;
        l_image->color_space = CLRSPC_SRGB;
 
-       if (! opj_setup_encoder_v2(l_codec,&l_param,l_image)) {
+       if (! opj_setup_encoder(l_codec,&l_param,l_image)) {
                fprintf(stderr, "ERROR -> test_tile_encoder: failed to setup the codec!\n");
                opj_destroy_codec(l_codec);
                opj_image_destroy(l_image);