[trunk] rename opj_destroy_cstr_info_v2 to opj_destroy_cstr_info

This commit is contained in:
Mickael Savinaud 2012-08-09 12:56:43 +00:00
parent 1c4ea6d246
commit f12fde9132
4 changed files with 5 additions and 5 deletions

View File

@ -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);
}

View File

@ -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){

View File

@ -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);

View File

@ -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);