diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 12:56:43 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 12:56:43 +0000 |
| commit | f12fde91328ed5b5cb5965be68bbda95cbe88385 (patch) | |
| tree | 9a2d363f2b9230a2b572925140aa96db653e4821 | |
| parent | 1c4ea6d246affdf874983b5f4d72465bea0b48cc (diff) | |
[trunk] rename opj_destroy_cstr_info_v2 to opj_destroy_cstr_info
| -rw-r--r-- | applications/codec/j2k_dump.c | 2 | ||||
| -rw-r--r-- | libopenjpeg/openjpeg.c | 2 | ||||
| -rw-r--r-- | libopenjpeg/openjpeg.h | 2 | ||||
| -rw-r--r-- | tests/j2k_random_tile_access.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/applications/codec/j2k_dump.c b/applications/codec/j2k_dump.c index 8a268867..fbdbce91 100644 --- 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 8dc300e1..c03fac31 100644 --- 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 dab91402..922f3ed8 100644 --- 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 123207f9..5a36d807 100644 --- 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); |