diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-09-27 13:14:15 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-09-27 13:14:15 +0000 |
| commit | 9a86a3bd23df64505cdad0ab16e82b2b4f5252a9 (patch) | |
| tree | 869bbeafa265afd189f39c7582d37eb8030769b8 /libopenjpeg/tcd.c | |
| parent | 69673635ef3b33eca1b821fe737ff250701782da (diff) | |
[trunk] remove t2_destroy, t2_decode_packets and t2_decode_packet
rename from t2_destroy_v2 to opj_t2_destroy
rename from t2_decode_packets_v2 to opj_t2_decode_packets
rename from t2_decode_packet_v2 to opj_t2_decode_packet
Diffstat (limited to 'libopenjpeg/tcd.c')
| -rw-r--r-- | libopenjpeg/tcd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libopenjpeg/tcd.c b/libopenjpeg/tcd.c index 32ad6cd9..d7725141 100644 --- a/libopenjpeg/tcd.c +++ b/libopenjpeg/tcd.c @@ -538,7 +538,7 @@ opj_bool opj_tcd_rateallocate( opj_tcd_v2_t *tcd, success = OPJ_TRUE; goodthresh = stable_thresh == 0? thresh : stable_thresh; - t2_destroy_v2(t2); + opj_t2_destroy(t2); } else { success = OPJ_TRUE; goodthresh = min; @@ -1467,7 +1467,7 @@ opj_bool opj_tcd_t2_decode (opj_tcd_v2_t *p_tcd, return OPJ_FALSE; } - if (! t2_decode_packets_v2( + if (! opj_t2_decode_packets( l_t2, p_tcd->tcd_tileno, p_tcd->tcd_image->tiles, @@ -1475,11 +1475,11 @@ opj_bool opj_tcd_t2_decode (opj_tcd_v2_t *p_tcd, p_data_read, p_max_src_size, p_cstr_index)) { - t2_destroy_v2(l_t2); + opj_t2_destroy(l_t2); return OPJ_FALSE; } - t2_destroy_v2(l_t2); + opj_t2_destroy(l_t2); /*---------------CLEAN-------------------*/ return OPJ_TRUE; @@ -1979,11 +1979,11 @@ opj_bool opj_tcd_t2_encode (opj_tcd_v2_t *p_tcd, p_tcd->cur_pino, FINAL_PASS)) { - t2_destroy_v2(l_t2); + opj_t2_destroy(l_t2); return OPJ_FALSE; } - t2_destroy_v2(l_t2); + opj_t2_destroy(l_t2); /*---------------CLEAN-------------------*/ return OPJ_TRUE; |