rename opj_create_compress_v2 to opj_create_compress

diff --git a/applications/codec/image_to_j2k.c b/applications/codec/image_to_j2k.c
index 7f512003b8ae0a095525a484b9e0837d4ae8eeca..03de5f23b58ae01d381a23a3c3d38a185631b0f9 100644 (file)
--- a/applications/codec/image_to_j2k.c
+++ b/applications/codec/image_to_j2k.c
@@ -1794,13 +1794,13 @@ int main(int argc, char **argv) {
                        case J2K_CFMT:  /* JPEG-2000 codestream */
                        {
                                /* Get a decoder handle */
-                               l_codec = opj_create_compress_v2(CODEC_J2K);
+                               l_codec = opj_create_compress(CODEC_J2K);
                                break;
                        }
                        case JP2_CFMT:  /* JPEG 2000 compressed image data */
                        {
                                /* Get a decoder handle */
-                               l_codec = opj_create_compress_v2(CODEC_JP2);
+                               l_codec = opj_create_compress(CODEC_JP2);
                                break;
                        }
                        default:

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 05c50d975e8dffae1724d32d68ab4ed555234696..7a92a30721eb48e271961071ec796e4b54818ace 100644 (file)
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -482,7 +482,7 @@ opj_bool OPJ_CALLCONV opj_setup_decoder(opj_codec_t *p_codec,
 /* ---------------------------------------------------------------------- */
 /* COMPRESSION FUNCTIONS*/
 
-opj_codec_t* OPJ_CALLCONV opj_create_compress_v2(OPJ_CODEC_FORMAT p_format)
+opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format)
 {
        opj_codec_private_t *l_codec = 00;
 

diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index 8e476e304cafae0c25873d547856255f0c9319c6..e5689102edc1972a9aaa13c10e2b8a7b0f4552cd 100644 (file)
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -1369,7 +1369,7 @@ OPJ_API opj_bool OPJ_CALLCONV opj_decode_tile_data(       opj_codec_t *p_codec,
  * @param      format          Coder to select
  * @return                             Returns a handle to a compressor if successful, returns NULL otherwise
  */
-OPJ_API opj_codec_t* OPJ_CALLCONV opj_create_compress_v2(OPJ_CODEC_FORMAT format);
+OPJ_API opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT format);
 
 /**
 Destroy a compressor handle

diff --git a/tests/test_tile_encoder.c b/tests/test_tile_encoder.c
index ea0b5a4dc224dfce527ab637d3665b487cd63aeb..ea57d269b7a5962653da561160197652b601a76a 100644 (file)
--- a/tests/test_tile_encoder.c
+++ b/tests/test_tile_encoder.c
@@ -244,11 +244,11 @@ int main (int argc, char *argv[])
   len = strlen( output_file );
   if( strcmp( output_file + len - 4, ".jp2" ) == 0 )
     {
-    l_codec = opj_create_compress_v2(CODEC_JP2);
+    l_codec = opj_create_compress(CODEC_JP2);
     }
   else
     {
-    l_codec = opj_create_compress_v2(CODEC_J2K);
+    l_codec = opj_create_compress(CODEC_J2K);
     }
        if (!l_codec) {
                return 1;