[trunk] Remove deprecated functions (not called anywhere in the code base).

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

diff --git a/src/lib/openjp2/tgt.c b/src/lib/openjp2/tgt.c
index 4b7dfa5326c0a3d93a943c4a6919e950b03c338a..6fd85587b9acc3055652101047570e504f33bc32 100644 (file)
--- a/src/lib/openjp2/tgt.c
+++ b/src/lib/openjp2/tgt.c
@@ -5,6 +5,8 @@
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2008;2011-2012, Centre National d'Etudes Spatiales (CNES), France 
+ * Copyright (c) 2012, CS Systemes d'Information, France
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +39,7 @@
 ==========================================================
 */
 
-opj_tgt_tree_t *tgt_create(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv) {
+opj_tgt_tree_t *opj_tgt_create(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv) {
         OPJ_INT32 nplh[32];
         OPJ_INT32 nplv[32];
         opj_tgt_node_t *node = 00;
@@ -51,7 +53,7 @@ opj_tgt_tree_t *tgt_create(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv) {
 
         tree = (opj_tgt_tree_t *) opj_malloc(sizeof(opj_tgt_tree_t));
         if(!tree) {
-                fprintf(stderr, "ERROR in tgt_create_v2 while allocating tree\n");
+                fprintf(stderr, "ERROR in tgt_create while allocating tree\n");
                 return 00;
         }
         memset(tree,0,sizeof(opj_tgt_tree_t));
@@ -74,13 +76,13 @@ opj_tgt_tree_t *tgt_create(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv) {
         /* ADD */
         if (tree->numnodes == 0) {
                 opj_free(tree);
-                fprintf(stderr, "WARNING in tgt_create_v2 tree->numnodes == 0, no tree created.\n");
+                fprintf(stderr, "WARNING in tgt_create tree->numnodes == 0, no tree created.\n");
                 return 00;
         }
 
         tree->nodes = (opj_tgt_node_t*) opj_calloc(tree->numnodes, sizeof(opj_tgt_node_t));
         if(!tree->nodes) {
-                fprintf(stderr, "ERROR in tgt_create_v2 while allocating node of the tree\n");
+                fprintf(stderr, "ERROR in tgt_create while allocating node of the tree\n");
                 opj_free(tree);
                 return 00;
         }
@@ -112,19 +114,19 @@ opj_tgt_tree_t *tgt_create(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv) {
                 }
         }
         node->parent = 0;
-        tgt_reset(tree);
+        opj_tgt_reset(tree);
         return tree;
 }
 
 /**
- * Reinitialises a tag-tree from an exixting one. (V2 framevork)
+ * Reinitialises a tag-tree from an existing one.
  *
  * @param       p_tree                          the tree to reinitialize.
  * @param       p_num_leafs_h           the width of the array of leafs of the tree
  * @param       p_num_leafs_v           the height of the array of leafs of the tree
  * @return      a new tag-tree if successful, NULL otherwise
 */
-opj_tgt_tree_t *tgt_init(opj_tgt_tree_t * p_tree,OPJ_UINT32 p_num_leafs_h, OPJ_UINT32 p_num_leafs_v)
+opj_tgt_tree_t *opj_tgt_init(opj_tgt_tree_t * p_tree,OPJ_UINT32 p_num_leafs_h, OPJ_UINT32 p_num_leafs_v)
 {
         OPJ_INT32 l_nplh[32];
         OPJ_INT32 l_nplv[32];
@@ -137,14 +139,11 @@ opj_tgt_tree_t *tgt_init(opj_tgt_tree_t * p_tree,OPJ_UINT32 p_num_leafs_h, OPJ_U
         OPJ_UINT32 n;
         OPJ_UINT32 l_node_size;
 
-        if
-                (! p_tree)
-        {
+        if (! p_tree){
                 return 00;
         }
-        if
-                ((p_tree->numleafsh != p_num_leafs_h) || (p_tree->numleafsv != p_num_leafs_v))
-        {
+
+        if ((p_tree->numleafsh != p_num_leafs_h) || (p_tree->numleafsv != p_num_leafs_v)) {
                 p_tree->numleafsh = p_num_leafs_h;
                 p_tree->numleafsv = p_num_leafs_v;
 
@@ -163,22 +162,17 @@ opj_tgt_tree_t *tgt_init(opj_tgt_tree_t * p_tree,OPJ_UINT32 p_num_leafs_h, OPJ_U
                 while (n > 1);
 
                 /* ADD */
-                if
-                        (p_tree->numnodes == 0)
-                {
-                        tgt_destroy(p_tree);
+                if (p_tree->numnodes == 0) {
+                        opj_tgt_destroy(p_tree);
                         return 00;
                 }
                 l_node_size = p_tree->numnodes * sizeof(opj_tgt_node_t);
-                if
-                        (l_node_size > p_tree->nodes_size)
-                {
+                
+                if (l_node_size > p_tree->nodes_size) {
                         opj_tgt_node_t* new_nodes = (opj_tgt_node_t*) opj_realloc(p_tree->nodes, l_node_size);
-                        if
-                                (! p_tree->nodes)
-                        {
-                                fprintf(stderr, "Not enough memory to reinitialize the tag tree\n");
-                                tgt_destroy(p_tree);
+                        if (! new_nodes) {
+                                fprintf(stderr, "ERROR Not enough memory to reinitialize the tag tree\n");
+                                opj_tgt_destroy(p_tree);
                                 return 00;
                         }
                         p_tree->nodes = new_nodes;
@@ -189,20 +183,13 @@ opj_tgt_tree_t *tgt_init(opj_tgt_tree_t * p_tree,OPJ_UINT32 p_num_leafs_h, OPJ_U
                 l_parent_node = &p_tree->nodes[p_tree->numleafsh * p_tree->numleafsv];
                 l_parent_node0 = l_parent_node;
 
-                for
-                        (i = 0; i < l_num_levels - 1; ++i)
-                {
-                        for
-                                (j = 0; j < l_nplv[i]; ++j)
-                        {
+                for (i = 0; i < l_num_levels - 1; ++i) {
+                        for (j = 0; j < l_nplv[i]; ++j) {
                                 k = l_nplh[i];
-                                while
-                                        (--k >= 0)
-                                {
+                                while (--k >= 0) {
                                         l_node->parent = l_parent_node;
                                         ++l_node;
-                                        if (--k >= 0)
-                                        {
+                                        if (--k >= 0) {
                                                 l_node->parent = l_parent_node;
                                                 ++l_node;
                                         }
@@ -221,17 +208,12 @@ opj_tgt_tree_t *tgt_init(opj_tgt_tree_t * p_tree,OPJ_UINT32 p_num_leafs_h, OPJ_U
                 }
                 l_node->parent = 0;
         }
-        tgt_reset(p_tree);
+        opj_tgt_reset(p_tree);
 
         return p_tree;
 }
 
-/*void tgt_destroy(opj_tgt_tree_t *tree) {
-        opj_free(tree->nodes);
-        opj_free(tree);
-}*/
-
-void tgt_destroy(opj_tgt_tree_t *p_tree)
+void opj_tgt_destroy(opj_tgt_tree_t *p_tree)
 {
         if (! p_tree) {
                 return;
@@ -244,20 +226,7 @@ void tgt_destroy(opj_tgt_tree_t *p_tree)
         opj_free(p_tree);
 }
 
-/*void tgt_reset(opj_tgt_tree_t *tree) {
-        int i;
-
-        if (NULL == tree)
-                return;
-        
-        for (i = 0; i < tree->numnodes; i++) {
-                tree->nodes[i].value = 999;
-                tree->nodes[i].low = 0;
-                tree->nodes[i].known = 0;
-        }
-}*/
-
-void tgt_reset(opj_tgt_tree_t *p_tree) {
+void opj_tgt_reset(opj_tgt_tree_t *p_tree) {
         OPJ_UINT32 i;
         opj_tgt_node_t * l_current_node = 00;;
 
@@ -275,7 +244,7 @@ void tgt_reset(opj_tgt_tree_t *p_tree) {
         }
 }
 
-void tgt_setvalue(opj_tgt_tree_t *tree, OPJ_UINT32 leafno, OPJ_INT32 value) {
+void opj_tgt_setvalue(opj_tgt_tree_t *tree, OPJ_UINT32 leafno, OPJ_INT32 value) {
         opj_tgt_node_t *node;
         node = &tree->nodes[leafno];
         while (node && node->value > value) {
@@ -284,7 +253,7 @@ void tgt_setvalue(opj_tgt_tree_t *tree, OPJ_UINT32 leafno, OPJ_INT32 value) {
         }
 }
 
-void tgt_encode(opj_bio_t *bio, opj_tgt_tree_t *tree, OPJ_UINT32 leafno, OPJ_INT32 threshold) {
+void opj_tgt_encode(opj_bio_t *bio, opj_tgt_tree_t *tree, OPJ_UINT32 leafno, OPJ_INT32 threshold) {
         opj_tgt_node_t *stk[31];
         opj_tgt_node_t **stkptr;
         opj_tgt_node_t *node;
@@ -308,12 +277,12 @@ void tgt_encode(opj_bio_t *bio, opj_tgt_tree_t *tree, OPJ_UINT32 leafno, OPJ_INT
                 while (low < threshold) {
                         if (low >= node->value) {
                                 if (!node->known) {
-                                        bio_write(bio, 1, 1);
+                                        opj_bio_write(bio, 1, 1);
                                         node->known = 1;
                                 }
                                 break;
                         }
-                        bio_write(bio, 0, 1);
+                        opj_bio_write(bio, 0, 1);
                         ++low;
                 }
                 
@@ -324,7 +293,7 @@ void tgt_encode(opj_bio_t *bio, opj_tgt_tree_t *tree, OPJ_UINT32 leafno, OPJ_INT
         }
 }
 
-OPJ_UINT32 tgt_decode(opj_bio_t *bio, opj_tgt_tree_t *tree, OPJ_UINT32 leafno, OPJ_INT32 threshold) {
+OPJ_UINT32 opj_tgt_decode(opj_bio_t *bio, opj_tgt_tree_t *tree, OPJ_UINT32 leafno, OPJ_INT32 threshold) {
         opj_tgt_node_t *stk[31];
         opj_tgt_node_t **stkptr;
         opj_tgt_node_t *node;
@@ -345,7 +314,7 @@ OPJ_UINT32 tgt_decode(opj_bio_t *bio, opj_tgt_tree_t *tree, OPJ_UINT32 leafno, O
                         low = node->low;
                 }
                 while (low < threshold && low < node->value) {
-                        if (bio_read(bio, 1)) {
+                        if (opj_bio_read(bio, 1)) {
                                 node->value = low;
                         } else {
                                 ++low;