[trunk] rename opj_destroy_cstr_info_v2 to opj_destroy_cstr_info

diff --git a/applications/codec/j2k_dump.c b/applications/codec/j2k_dump.c
index 8a2688675c79dd04a783d5314df277a42fc44d49..fbdbce9132f49ec1e1804c89f61038023f26f09d 100644 (file)
--- a/applications/codec/j2k_dump.c
+++ b/applications/codec/j2k_dump.c
@@ -574,7 +574,7 @@ int main(int argc, char *argv[])
                opj_destroy_cstr_index(&cstr_index);
 
                /* destroy the codestream info */
-               opj_destroy_cstr_info_v2(&cstr_info);
+               opj_destroy_cstr_info(&cstr_info);
 
        }
 

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 8dc300e1686ee2b779d3a646593fd2490d90714b..c03fac31c5b00945abfe9df88704e7fd5cd4fe25 100644 (file)
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -1067,7 +1067,7 @@ opj_codestream_info_v2_t* OPJ_CALLCONV opj_get_cstr_info(opj_codec_t *p_codec)
  *
  *
  */
-void OPJ_CALLCONV opj_destroy_cstr_info_v2(opj_codestream_info_v2_t **cstr_info) {
+void OPJ_CALLCONV opj_destroy_cstr_info(opj_codestream_info_v2_t **cstr_info) {
        if (cstr_info) {
 
                if ((*cstr_info)->m_default_tile_info.tccp_info){

diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index dab9140295ae5dbe1505c53fa9f2ac09922a94eb..922f3ed8f8438a8ce81418f7ae597b18a530ee31 100644 (file)
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -1431,7 +1431,7 @@ OPJ_API opj_bool OPJ_CALLCONV opj_encode(opj_codec_t *p_codec,
 Destroy Codestream information after compression or decompression
 @param cstr_info Codestream information structure
 */
-OPJ_API void OPJ_CALLCONV opj_destroy_cstr_info_v2(opj_codestream_info_v2_t **cstr_info);
+OPJ_API void OPJ_CALLCONV opj_destroy_cstr_info(opj_codestream_info_v2_t **cstr_info);
 
 
 

diff --git a/tests/j2k_random_tile_access.c b/tests/j2k_random_tile_access.c
index 123207f98b21c7e0d3aec7e63d6ab1db62ab2ba2..5a36d8071ce670b84f004d5d58074983fdbb21ce 100644 (file)
--- a/tests/j2k_random_tile_access.c
+++ b/tests/j2k_random_tile_access.c
@@ -263,7 +263,7 @@ int main(int argc, char **argv)
        if(!opj_get_decoded_tile(l_codec, l_stream, image, tile_index )){ \
                fprintf(stderr, "ERROR -> j2k_to_image: failed to decode tile %d\n", tile_index); \
                opj_stream_destroy(l_stream); \
-               opj_destroy_cstr_info_v2(&cstr_info); \
+               opj_destroy_cstr_info(&cstr_info); \
                opj_destroy_codec(l_codec); \
                opj_image_destroy(image); \
                fclose(fsrc); \
@@ -282,7 +282,7 @@ int main(int argc, char **argv)
        opj_stream_destroy(l_stream);
 
        /* Destroy code stream info */
-       opj_destroy_cstr_info_v2(&cstr_info);
+       opj_destroy_cstr_info(&cstr_info);
 
        /* Free remaining structures */
        opj_destroy_codec(l_codec);