Remove warnings related to empty tag-trees. 893/head
authorEven Rouault <even.rouault@spatialys.com>
Mon, 13 Feb 2017 11:36:45 +0000 (12:36 +0100)
committerEven Rouault <even.rouault@spatialys.com>
Mon, 13 Feb 2017 11:36:45 +0000 (12:36 +0100)
Decoding some valid .jp2 files like Sentinel2 datasets leads to warnings like:
No incltree created.
tgt_create tree->numnodes == 0, no tree created.
No imsbtree created.
tgt_create tree->numnodes == 0, no tree created.

Besides that, the image is correctly decoded. So there is no reason to emit
those warnings.

src/lib/openjp2/tcd.c
src/lib/openjp2/tgt.c

index 36f408435aa48a79748300bde41f78a0ea85f183..18e14480b0eeeaed8079aeaed51aefdd494130c8 100644 (file)
@@ -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);
index 5e34aa91298c6e2e49394c460ec9dc197f9116a9..4892df6b7db6a11c83437ac03a3ae4d457f01f82 100644 (file)
@@ -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;
         }