diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-10-25 14:54:19 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-10-25 14:54:19 +0000 |
| commit | a41790ce8a3afd681182513232605948c18c3be8 (patch) | |
| tree | 464068eb0d01e1ab7964224213df31ff0e9c2158 /src/lib/openjp2/tcd.c | |
| parent | 06615a556d19a126a0e7a84a6cf8599aec134773 (diff) | |
[trunk] [trunk] remove old opj_t2 and rename opj_t2_v2 to opj_t2
Diffstat (limited to 'src/lib/openjp2/tcd.c')
| -rw-r--r-- | src/lib/openjp2/tcd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c index 3c780d46..9cff1d03 100644 --- a/src/lib/openjp2/tcd.c +++ b/src/lib/openjp2/tcd.c @@ -479,7 +479,7 @@ opj_bool opj_tcd_rateallocate( opj_tcd_t *tcd, -q xx,yy,zz,0 (fixed_quality == 1 and distoratio == 0) ==> possible to have some lossy layers and the last layer for sure lossless */ if ( ((cp->m_specific_param.m_enc.m_disto_alloc==1) && (tcd_tcp->rates[layno]>0)) || ((cp->m_specific_param.m_enc.m_fixed_quality==1) && (tcd_tcp->distoratio[layno]>0))) { - opj_t2_v2_t*t2 = opj_t2_create(tcd->image, cp); + opj_t2_t*t2 = opj_t2_create(tcd->image, cp); OPJ_FLOAT64 thresh = 0; if (t2 == 00) { @@ -1462,7 +1462,7 @@ opj_bool opj_tcd_t2_decode (opj_tcd_t *p_tcd, opj_codestream_index_t *p_cstr_index ) { - opj_t2_v2_t * l_t2; + opj_t2_t * l_t2; l_t2 = opj_t2_create(p_tcd->image, p_tcd->cp); if (l_t2 == 00) { @@ -1960,7 +1960,7 @@ opj_bool opj_tcd_t2_encode (opj_tcd_t *p_tcd, OPJ_UINT32 p_max_dest_size, opj_codestream_info_t *p_cstr_info ) { - opj_t2_v2_t * l_t2; + opj_t2_t * l_t2; l_t2 = opj_t2_create(p_tcd->image, p_tcd->cp); if (l_t2 == 00) { |