summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@mines-paris.org>2017-05-03 11:48:02 +0200
committerGitHub <noreply@github.com>2017-05-03 11:48:02 +0200
commita18040e02238c577cf7853a0e303cbca62e044a8 (patch)
tree0f46338549f4327ee2c0d9b628dabab2bef9ef88 /src
parente7ff1efb82fab7ba6c6d69e7d286811abb4ee7e7 (diff)
parenta43f1bea6273e87d9e5cb6e428f560ae7a59223b (diff)
Merge pull request #893 from rouault/remove_tagtree_warnings
Remove warnings related to empty tag-trees.
Diffstat (limited to 'src')
-rw-r--r--src/lib/openjp2/tcd.c10
-rw-r--r--src/lib/openjp2/tgt.c1
2 files changed, 0 insertions, 11 deletions
diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c
index 36f40843..18e14480 100644
--- a/src/lib/openjp2/tcd.c
+++ b/src/lib/openjp2/tcd.c
@@ -987,11 +987,6 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no,
l_current_precinct->incltree = opj_tgt_init(l_current_precinct->incltree, l_current_precinct->cw, l_current_precinct->ch, manager);
}
- if (! l_current_precinct->incltree) {
- opj_event_msg(manager, EVT_WARNING, "No incltree created.\n");
- /*return OPJ_FALSE;*/
- }
-
if (! l_current_precinct->imsbtree) {
l_current_precinct->imsbtree = opj_tgt_create(l_current_precinct->cw, l_current_precinct->ch, manager);
}
@@ -999,11 +994,6 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no,
l_current_precinct->imsbtree = opj_tgt_init(l_current_precinct->imsbtree, l_current_precinct->cw, l_current_precinct->ch, manager);
}
- if (! l_current_precinct->imsbtree) {
- opj_event_msg(manager, EVT_WARNING, "No imsbtree created.\n");
- /*return OPJ_FALSE;*/
- }
-
for (cblkno = 0; cblkno < l_nb_code_blocks; ++cblkno) {
OPJ_INT32 cblkxstart = tlcblkxstart + (OPJ_INT32)(cblkno % l_current_precinct->cw) * (1 << cblkwidthexpn);
OPJ_INT32 cblkystart = tlcblkystart + (OPJ_INT32)(cblkno / l_current_precinct->cw) * (1 << cblkheightexpn);
diff --git a/src/lib/openjp2/tgt.c b/src/lib/openjp2/tgt.c
index 5e34aa91..4892df6b 100644
--- a/src/lib/openjp2/tgt.c
+++ b/src/lib/openjp2/tgt.c
@@ -81,7 +81,6 @@ opj_tgt_tree_t *opj_tgt_create(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv, opj_e
/* ADD */
if (tree->numnodes == 0) {
opj_free(tree);
- opj_event_msg(manager, EVT_WARNING, "tgt_create tree->numnodes == 0, no tree created.\n");
return 00;
}