diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-01 15:29:36 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-01 15:29:36 +0000 |
| commit | 394db7b7382ee5b868b193febae6b119ff03c59c (patch) | |
| tree | 77ec7662201c802395d821f3c7d4b6856f5251af /src/lib | |
| parent | 3ad58ee1f5df589646d11b3088788f05b089fa6b (diff) | |
[trunk] Remove old function tgt_create
Fix some warnings about size_t
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/openjp2/event.c | 4 | ||||
| -rw-r--r-- | src/lib/openjp2/tcd.c | 4 | ||||
| -rw-r--r-- | src/lib/openjp2/tgt.c | 73 | ||||
| -rw-r--r-- | src/lib/openjp2/tgt.h | 3 |
4 files changed, 6 insertions, 78 deletions
diff --git a/src/lib/openjp2/event.c b/src/lib/openjp2/event.c index 23978b5b..fa505619 100644 --- a/src/lib/openjp2/event.c +++ b/src/lib/openjp2/event.c @@ -97,7 +97,7 @@ opj_bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt, .. if ((fmt != NULL) && (event_mgr != NULL)) { va_list arg; - int str_length/*, i, j*/; /* UniPG */ + size_t str_length/*, i, j*/; /* UniPG */ char message[MSG_SIZE]; memset(message, 0, MSG_SIZE); /* initialize the optional parameter list */ @@ -148,7 +148,7 @@ opj_bool opj_event_msg_v2(opj_event_mgr_t* p_event_mgr, int event_type, const ch if ((fmt != 00) && (p_event_mgr != 00)) { va_list arg; - int str_length/*, i, j*/; /* UniPG */ + size_t str_length/*, i, j*/; /* UniPG */ char message[MSG_SIZE]; memset(message, 0, MSG_SIZE); /* initialize the optional parameter list */ diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c index d7725141..e7ad8031 100644 --- a/src/lib/openjp2/tcd.c +++ b/src/lib/openjp2/tcd.c @@ -919,7 +919,7 @@ opj_bool FUNCTION ( opj_tcd_v2_t *p_tcd, \ } \ \ if (! l_current_precinct->incltree) { \ - l_current_precinct->incltree = tgt_create_v2(l_current_precinct->cw, \ + l_current_precinct->incltree = tgt_create(l_current_precinct->cw, \ l_current_precinct->ch); \ } \ else{ \ @@ -934,7 +934,7 @@ opj_bool FUNCTION ( opj_tcd_v2_t *p_tcd, \ } \ \ if (! l_current_precinct->imsbtree) { \ - l_current_precinct->imsbtree = tgt_create_v2( \ + l_current_precinct->imsbtree = tgt_create( \ l_current_precinct->cw, \ l_current_precinct->ch); \ } \ diff --git a/src/lib/openjp2/tgt.c b/src/lib/openjp2/tgt.c index 54bf536b..4b7dfa53 100644 --- a/src/lib/openjp2/tgt.c +++ b/src/lib/openjp2/tgt.c @@ -37,78 +37,7 @@ ========================================================== */ -opj_tgt_tree_t *tgt_create(int numleafsh, int numleafsv) { - int nplh[32]; - int nplv[32]; - opj_tgt_node_t *node = NULL; - opj_tgt_node_t *parentnode = NULL; - opj_tgt_node_t *parentnode0 = NULL; - opj_tgt_tree_t *tree = NULL; - int i, j, k; - int numlvls; - int n; - - tree = (opj_tgt_tree_t *) opj_malloc(sizeof(opj_tgt_tree_t)); - if(!tree) return NULL; - tree->numleafsh = numleafsh; - tree->numleafsv = numleafsv; - - numlvls = 0; - nplh[0] = numleafsh; - nplv[0] = numleafsv; - tree->numnodes = 0; - do { - n = nplh[numlvls] * nplv[numlvls]; - nplh[numlvls + 1] = (nplh[numlvls] + 1) / 2; - nplv[numlvls + 1] = (nplv[numlvls] + 1) / 2; - tree->numnodes += n; - ++numlvls; - } while (n > 1); - - /* ADD */ - if (tree->numnodes == 0) { - opj_free(tree); - return NULL; - } - - tree->nodes = (opj_tgt_node_t*) opj_calloc(tree->numnodes, sizeof(opj_tgt_node_t)); - if(!tree->nodes) { - opj_free(tree); - return NULL; - } - - node = tree->nodes; - parentnode = &tree->nodes[tree->numleafsh * tree->numleafsv]; - parentnode0 = parentnode; - - for (i = 0; i < numlvls - 1; ++i) { - for (j = 0; j < nplv[i]; ++j) { - k = nplh[i]; - while (--k >= 0) { - node->parent = parentnode; - ++node; - if (--k >= 0) { - node->parent = parentnode; - ++node; - } - ++parentnode; - } - if ((j & 1) || j == nplv[i] - 1) { - parentnode0 = parentnode; - } else { - parentnode = parentnode0; - parentnode0 += nplh[i]; - } - } - } - node->parent = 0; - - tgt_reset(tree); - - return tree; -} - -opj_tgt_tree_t *tgt_create_v2(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv) { +opj_tgt_tree_t *tgt_create(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv) { OPJ_INT32 nplh[32]; OPJ_INT32 nplv[32]; opj_tgt_node_t *node = 00; diff --git a/src/lib/openjp2/tgt.h b/src/lib/openjp2/tgt.h index d3880f13..415eee2d 100644 --- a/src/lib/openjp2/tgt.h +++ b/src/lib/openjp2/tgt.h @@ -75,8 +75,7 @@ Create a tag-tree @param numleafsv Height of the array of leafs of the tree @return Returns a new tag-tree if successful, returns NULL otherwise */ -opj_tgt_tree_t *tgt_create(int numleafsh, int numleafsv); -opj_tgt_tree_t *tgt_create_v2(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv); +opj_tgt_tree_t *tgt_create(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv); /** * Reinitialises a tag-tree from an exixting one. |