[trunk] update global functions of tgt with opj_ prefix

[openjpeg.git] / src / lib / openjp2 / t2.c

diff --git a/src/lib/openjp2/t2.c b/src/lib/openjp2/t2.c
index 8dbb22baeedb535adaf70900d1f9a62f122cce4b..0c32ca601337ed618dce4b2c2935692afe0636f1 100644 (file)
--- a/src/lib/openjp2/t2.c
+++ b/src/lib/openjp2/t2.c
@@ -215,7 +215,7 @@ opj_bool opj_t2_encode_packets( opj_t2_v2_t* p_t2,
         OPJ_UINT32 l_max_comp = l_cp->m_specific_param.m_enc.m_max_comp_size > 0 ? l_image->numcomps : 1;
         OPJ_UINT32 l_nb_pocs = l_tcp->numpocs + 1;
 
-        l_pi = pi_initialise_encode_v2(l_image, l_cp, p_tile_no, p_t2_mode);
+        l_pi = opj_pi_initialise_encode(l_image, l_cp, p_tile_no, p_t2_mode);
         if (!l_pi) {
                 return OPJ_FALSE;
         }
@@ -233,14 +233,14 @@ opj_bool opj_t2_encode_packets( opj_t2_v2_t* p_t2,
                                 OPJ_UINT32 l_tp_num = compno;
 
                                 /* TODO MSD : check why this function cannot fail (cf. v1) */
-                                pi_create_encode_v2(l_pi, l_cp,p_tile_no,poc,l_tp_num,p_tp_pos,p_t2_mode);
+                                opj_pi_create_encode(l_pi, l_cp,p_tile_no,poc,l_tp_num,p_tp_pos,p_t2_mode);
 
                                 while (opj_pi_next(l_current_pi)) {
                                         if (l_current_pi->layno < p_maxlayers) {
                                                 l_nb_bytes = 0;
 
                                                 if (! opj_t2_encode_packet(p_tile_no,p_tile, l_tcp, l_current_pi, l_current_data, &l_nb_bytes, p_max_len, cstr_info)) {
-                                                        pi_destroy_v2(l_pi, l_nb_pocs);
+                                                        opj_pi_destroy(l_pi, l_nb_pocs);
                                                         return OPJ_FALSE;
                                                 }
 
@@ -254,7 +254,7 @@ opj_bool opj_t2_encode_packets( opj_t2_v2_t* p_t2,
 
                                 if (l_cp->m_specific_param.m_enc.m_max_comp_size) {
                                         if (l_comp_len > l_cp->m_specific_param.m_enc.m_max_comp_size) {
-                                                pi_destroy_v2(l_pi, l_nb_pocs);
+                                                opj_pi_destroy(l_pi, l_nb_pocs);
                                                 return OPJ_FALSE;
                                         }
                                 }
@@ -264,7 +264,7 @@ opj_bool opj_t2_encode_packets( opj_t2_v2_t* p_t2,
                 }
         }
         else {  /* t2_mode == FINAL_PASS  */
-                pi_create_encode_v2(l_pi, l_cp,p_tile_no,p_pino,p_tp_num,p_tp_pos,p_t2_mode);
+                opj_pi_create_encode(l_pi, l_cp,p_tile_no,p_pino,p_tp_num,p_tp_pos,p_t2_mode);
 
                 l_current_pi = &l_pi[p_pino];
 
@@ -273,7 +273,7 @@ opj_bool opj_t2_encode_packets( opj_t2_v2_t* p_t2,
                                 l_nb_bytes=0;
 
                                 if (! opj_t2_encode_packet(p_tile_no,p_tile, l_tcp, l_current_pi, l_current_data, &l_nb_bytes, p_max_len, cstr_info)) {
-                                        pi_destroy_v2(l_pi, l_nb_pocs);
+                                        opj_pi_destroy(l_pi, l_nb_pocs);
                                         return OPJ_FALSE;
                                 }
 
@@ -305,7 +305,7 @@ opj_bool opj_t2_encode_packets( opj_t2_v2_t* p_t2,
                 }
         }
 
-        pi_destroy_v2(l_pi, l_nb_pocs);
+        opj_pi_destroy(l_pi, l_nb_pocs);
 
         return OPJ_TRUE;
 }
@@ -340,7 +340,7 @@ opj_bool opj_t2_decode_packets( opj_t2_v2_t *p_t2,
 #endif
 
         /* create a packet iterator */
-        l_pi = pi_create_decode_v2(l_image, l_cp, p_tile_no);
+        l_pi = opj_pi_create_decode(l_image, l_cp, p_tile_no);
         if (!l_pi) {
                 return OPJ_FALSE;
         }
@@ -368,7 +368,7 @@ opj_bool opj_t2_decode_packets( opj_t2_v2_t *p_t2,
                                 first_pass_failed[l_current_pi->compno] = OPJ_FALSE;
 
                                 if (! opj_t2_decode_packet(p_t2,p_tile,l_tcp,l_current_pi,l_current_data,&l_nb_bytes_read,p_max_len,l_pack_info)) {
-                                        pi_destroy_v2(l_pi,l_nb_pocs);
+                                        opj_pi_destroy(l_pi,l_nb_pocs);
                                         return OPJ_FALSE;
                                 }
 
@@ -378,7 +378,7 @@ opj_bool opj_t2_decode_packets( opj_t2_v2_t *p_t2,
                         else {
                                 l_nb_bytes_read = 0;
                                 if (! opj_t2_skip_packet(p_t2,p_tile,l_tcp,l_current_pi,l_current_data,&l_nb_bytes_read,p_max_len,l_pack_info)) {
-                                        pi_destroy_v2(l_pi,l_nb_pocs);
+                                        opj_pi_destroy(l_pi,l_nb_pocs);
                                         return OPJ_FALSE;
                                 }
                         }
@@ -428,7 +428,7 @@ opj_bool opj_t2_decode_packets( opj_t2_v2_t *p_t2,
         /* << INDEX */
 
         /* don't forget to release pi */
-        pi_destroy_v2(l_pi,l_nb_pocs);
+        opj_pi_destroy(l_pi,l_nb_pocs);
         *p_data_read = l_current_data - p_src;
         return OPJ_TRUE;
 }
@@ -547,15 +547,15 @@ opj_bool opj_t2_encode_packet(  OPJ_UINT32 tileno,
                 for(bandno = 0; bandno < res->numbands; ++bandno) {
                         opj_tcd_precinct_v2_t *prc = &band->precincts[precno];
 
-                        tgt_reset(prc->incltree);
-                        tgt_reset(prc->imsbtree);
+                        opj_tgt_reset(prc->incltree);
+                        opj_tgt_reset(prc->imsbtree);
 
                         l_nb_blocks = prc->cw * prc->ch;
                         for     (cblkno = 0; cblkno < l_nb_blocks; ++cblkno) {
                                 opj_tcd_cblk_enc_v2_t* cblk = &prc->cblks.enc[cblkno];
 
                                 cblk->numpasses = 0;
-                                tgt_setvalue(prc->imsbtree, cblkno, band->numbps - cblk->numbps);
+                                opj_tgt_setvalue(prc->imsbtree, cblkno, band->numbps - cblk->numbps);
                         }
                         ++band;
                 }
@@ -577,7 +577,7 @@ opj_bool opj_t2_encode_packet(  OPJ_UINT32 tileno,
                         opj_tcd_layer_t *layer = &cblk->layers[layno];
 
                         if (!cblk->numpasses && layer->numpasses) {
-                                tgt_setvalue(prc->incltree, cblkno, layno);
+                                opj_tgt_setvalue(prc->incltree, cblkno, layno);
                         }
 
                         ++cblk;
@@ -593,7 +593,7 @@ opj_bool opj_t2_encode_packet(  OPJ_UINT32 tileno,
 
                         /* cblk inclusion bits */
                         if (!cblk->numpasses) {
-                                tgt_encode(bio, prc->incltree, cblkno, layno + 1);
+                                opj_tgt_encode(bio, prc->incltree, cblkno, layno + 1);
                         } else {
                                 opj_bio_write(bio, layer->numpasses != 0, 1);
                         }
@@ -607,7 +607,7 @@ opj_bool opj_t2_encode_packet(  OPJ_UINT32 tileno,
                         /* if first instance of cblk --> zero bit-planes information */
                         if (!cblk->numpasses) {
                                 cblk->numlenbits = 3;
-                                tgt_encode(bio, prc->imsbtree, cblkno, 999);
+                                opj_tgt_encode(bio, prc->imsbtree, cblkno, 999);
                         }
 
                         /* number of coding passes included */
@@ -804,8 +804,8 @@ opj_bool opj_t2_read_packet_header( opj_t2_v2_t* p_t2,
                         opj_tcd_precinct_v2_t *l_prc = &l_band->precincts[p_pi->precno];
 
                         if ( ! ((l_band->x1-l_band->x0 == 0)||(l_band->y1-l_band->y0 == 0)) ) {
-                                tgt_reset(l_prc->incltree);
-                                tgt_reset(l_prc->imsbtree);
+                                opj_tgt_reset(l_prc->incltree);
+                                opj_tgt_reset(l_prc->imsbtree);
                                 l_cblk = l_prc->cblks.dec;
 
                                 l_nb_code_blocks = l_prc->cw * l_prc->ch;
@@ -914,7 +914,7 @@ opj_bool opj_t2_read_packet_header( opj_t2_v2_t* p_t2,
 
                         /* if cblk not yet included before --> inclusion tagtree */
                         if (!l_cblk->numsegs) {
-                                l_included = tgt_decode(l_bio, l_prc->incltree, cblkno, p_pi->layno + 1);
+                                l_included = opj_tgt_decode(l_bio, l_prc->incltree, cblkno, p_pi->layno + 1);
                                 /* else one bit */
                         }
                         else {
@@ -932,7 +932,7 @@ opj_bool opj_t2_read_packet_header( opj_t2_v2_t* p_t2,
                         if (!l_cblk->numsegs) {
                                 OPJ_UINT32 i = 0;
 
-                                while (!tgt_decode(l_bio, l_prc->imsbtree, cblkno, i)) {
+                                while (!opj_tgt_decode(l_bio, l_prc->imsbtree, cblkno, i)) {
                                         ++i;
                                 }