@@ -9863,9 +9863,7 @@ static OPJ_BOOL opj_j2k_decode_one_tile ( opj_j2k_t *p_j2k,
9863
9863
if (! l_new_current_data ) {
9864
9864
opj_free (l_current_data );
9865
9865
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 );
9869
9867
return OPJ_FALSE ;
9870
9868
}
9871
9869
l_current_data = l_new_current_data ;
@@ -9876,13 +9874,13 @@ static OPJ_BOOL opj_j2k_decode_one_tile ( opj_j2k_t *p_j2k,
9876
9874
opj_free (l_current_data );
9877
9875
return OPJ_FALSE ;
9878
9876
}
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 );
9880
9878
9881
9879
if (! opj_j2k_update_image_data (p_j2k -> m_tcd ,l_current_data , p_j2k -> m_output_image )) {
9882
9880
opj_free (l_current_data );
9883
9881
return OPJ_FALSE ;
9884
9882
}
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 );
9886
9884
9887
9885
if (l_current_tile_no == l_tile_no_to_dec )
9888
9886
{
@@ -9895,7 +9893,7 @@ static OPJ_BOOL opj_j2k_decode_one_tile ( opj_j2k_t *p_j2k,
9895
9893
break ;
9896
9894
}
9897
9895
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 );
9899
9897
}
9900
9898
9901
9899
}
0 commit comments