[trunk] rename opj_encode_v2 to opj_encode

diff --git a/applications/codec/image_to_j2k.c b/applications/codec/image_to_j2k.c
index ca624ad70f8e18bd4ecfe148d4a1e9dbe9d5aa78..71bafdb2e868b2c1c820f0c375e87d03d6e24251 100644 (file)
--- a/applications/codec/image_to_j2k.c
+++ b/applications/codec/image_to_j2k.c
@@ -1861,9 +1861,9 @@ int main(int argc, char **argv) {
       free(l_data);
     }
     else {
-      bSuccess = bSuccess && opj_encode_v2(l_codec, l_stream);
+      bSuccess = bSuccess && opj_encode(l_codec, l_stream);
       if (!bSuccess)  {
-        fprintf(stderr, "failed to encode image: opj_encode_v2\n");
+        fprintf(stderr, "failed to encode image: opj_encode\n");
       }
     }
                bSuccess = bSuccess && opj_end_compress(l_codec, l_stream);

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 14b516ed96e29cb2994ce546baeb947f9a4bcac5..22900d12b206d94a2c195306d79155fa7d34dfa5 100644 (file)
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -675,7 +675,7 @@ opj_bool OPJ_CALLCONV opj_start_compress (  opj_codec_t *p_codec,
        return OPJ_FALSE;
 }
 
-opj_bool OPJ_CALLCONV opj_encode_v2(opj_codec_t *p_info, opj_stream_t *p_stream)
+opj_bool OPJ_CALLCONV opj_encode(opj_codec_t *p_info, opj_stream_t *p_stream)
 {
        if (p_info && p_stream) {
                opj_codec_private_t * l_codec = (opj_codec_private_t *) p_info;

diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index 5b8d3a8193c357dff64736f70bd23e406f3056bb..60cdfa3f1617abba9b63901a524952f1f1047086 100644 (file)
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -1423,8 +1423,8 @@ OPJ_API opj_bool OPJ_CALLCONV opj_end_compress (opj_codec_t *p_codec,
  *
  * @return                             Returns true if successful, returns false otherwise
  */
-OPJ_API opj_bool OPJ_CALLCONV opj_encode_v2(opj_codec_t *p_codec, 
-                                                                                       opj_stream_t *p_stream);
+OPJ_API opj_bool OPJ_CALLCONV opj_encode(opj_codec_t *p_codec, 
+                                         opj_stream_t *p_stream);
 
 
 /**