Skip to content

Commit 5c5ae1d

Browse files
committed
fixed tile numbering
Fixes uclouvain#245
1 parent 3767af5 commit 5c5ae1d

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/lib/openjp2/j2k.c

+4-6
Original file line numberDiff line numberDiff line change
@@ -9863,9 +9863,7 @@ static OPJ_BOOL opj_j2k_decode_one_tile ( opj_j2k_t *p_j2k,
98639863
if (! l_new_current_data) {
98649864
opj_free(l_current_data);
98659865
l_current_data = NULL;
9866-
/* TODO: LH: why tile numbering policy used in messages differs from
9867-
the one used in opj_j2k_decode_tiles() ? */
9868-
opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to decode tile %d/%d\n", l_current_tile_no, (p_j2k->m_cp.th * p_j2k->m_cp.tw) - 1);
9866+
opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to decode tile %d/%d\n", l_current_tile_no+1, p_j2k->m_cp.th * p_j2k->m_cp.tw);
98699867
return OPJ_FALSE;
98709868
}
98719869
l_current_data = l_new_current_data;
@@ -9876,13 +9874,13 @@ static OPJ_BOOL opj_j2k_decode_one_tile ( opj_j2k_t *p_j2k,
98769874
opj_free(l_current_data);
98779875
return OPJ_FALSE;
98789876
}
9879-
opj_event_msg(p_manager, EVT_INFO, "Tile %d/%d has been decoded.\n", l_current_tile_no, (p_j2k->m_cp.th * p_j2k->m_cp.tw) - 1);
9877+
opj_event_msg(p_manager, EVT_INFO, "Tile %d/%d has been decoded.\n", l_current_tile_no+1, p_j2k->m_cp.th * p_j2k->m_cp.tw);
98809878

98819879
if (! opj_j2k_update_image_data(p_j2k->m_tcd,l_current_data, p_j2k->m_output_image)) {
98829880
opj_free(l_current_data);
98839881
return OPJ_FALSE;
98849882
}
9885-
opj_event_msg(p_manager, EVT_INFO, "Image data has been updated with tile %d.\n\n", l_current_tile_no);
9883+
opj_event_msg(p_manager, EVT_INFO, "Image data has been updated with tile %d.\n\n", l_current_tile_no+1);
98869884

98879885
if(l_current_tile_no == l_tile_no_to_dec)
98889886
{
@@ -9895,7 +9893,7 @@ static OPJ_BOOL opj_j2k_decode_one_tile ( opj_j2k_t *p_j2k,
98959893
break;
98969894
}
98979895
else {
9898-
opj_event_msg(p_manager, EVT_WARNING, "Tile read, decode and updated is not the desired (%d vs %d).\n", l_current_tile_no, l_tile_no_to_dec);
9896+
opj_event_msg(p_manager, EVT_WARNING, "Tile read, decoded and updated is not the desired one (%d vs %d).\n", l_current_tile_no+1, l_tile_no_to_dec+1);
98999897
}
99009898

99019899
}

0 commit comments

Comments
 (0)