From 1c4ea6d246affdf874983b5f4d72465bea0b48cc Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 9 Aug 2012 12:52:28 +0000 Subject: [PATCH] remove deprecated v1 style function opj_destroy_cstr_info --- libopenjpeg/openjpeg.c | 21 --------------------- libopenjpeg/openjpeg.h | 2 -- 2 files changed, 23 deletions(-) diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index f71d07b9..8dc300e1 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -1010,27 +1010,6 @@ opj_bool OPJ_CALLCONV opj_write_tile ( opj_codec_t *p_codec, } -/* DEPRECATED */ -void OPJ_CALLCONV opj_destroy_cstr_info(opj_codestream_info_t *cstr_info) { - if (cstr_info) { - int tileno; - for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) { - opj_tile_info_t *tile_info = &cstr_info->tile[tileno]; - opj_free(tile_info->thresh); - opj_free(tile_info->packet); - opj_free(tile_info->tp); - opj_free(tile_info->marker); - } - opj_free(cstr_info->tile); - opj_free(cstr_info->marker); - opj_free(cstr_info->numdecompos); - } -} - - - - - void OPJ_CALLCONV opj_destroy_codec(opj_codec_t *p_codec) { if (p_codec) { diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h index 60cdfa3f..dab91402 100644 --- a/libopenjpeg/openjpeg.h +++ b/libopenjpeg/openjpeg.h @@ -1431,8 +1431,6 @@ 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(opj_codestream_info_t *cstr_info); - OPJ_API void OPJ_CALLCONV opj_destroy_cstr_info_v2(opj_codestream_info_v2_t **cstr_info);