walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

opj_t2_encode_packet(): only emit an error about insufficiently large output buffer in FINAL_PASS mode. Fixes (master-only) regression added in 0b4fef6d19

This commit is contained in:
Even Rouault 2017-08-16 12:52:33 +02:00
parent 4241ae6fbb
commit 9624b2fa47
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/openjp2/t2.c
View File

@ -68,6 +68,7 @@ Encode a packet of a tile to a destination buffer
@param p_data_written FIXME DOC @param p_data_written FIXME DOC
@param len Length of the destination buffer @param len Length of the destination buffer
@param cstr_info Codestream information structure @param cstr_info Codestream information structure
@param p_t2_mode If == THRESH_CALC In Threshold calculation ,If == FINAL_PASS Final pass
@param p_manager the user event manager @param p_manager the user event manager
@return @return
*/ */
@ -79,6 +80,7 @@ static OPJ_BOOL opj_t2_encode_packet(OPJ_UINT32 tileno,
OPJ_UINT32 * p_data_written, OPJ_UINT32 * p_data_written,
OPJ_UINT32 len, OPJ_UINT32 len,
opj_codestream_info_t *cstr_info, opj_codestream_info_t *cstr_info,
J2K_T2_MODE p_t2_mode,
opj_event_mgr_t *p_manager); opj_event_mgr_t *p_manager);
/** /**
@ -273,6 +275,7 @@ OPJ_BOOL opj_t2_encode_packets(opj_t2_t* p_t2,
if (! opj_t2_encode_packet(p_tile_no, p_tile, l_tcp, l_current_pi, if (! opj_t2_encode_packet(p_tile_no, p_tile, l_tcp, l_current_pi,
l_current_data, &l_nb_bytes, l_current_data, &l_nb_bytes,
p_max_len, cstr_info, p_max_len, cstr_info,
p_t2_mode,
p_manager)) { p_manager)) {
opj_pi_destroy(l_pi, l_nb_pocs); opj_pi_destroy(l_pi, l_nb_pocs);
return OPJ_FALSE; return OPJ_FALSE;
@ -311,7 +314,8 @@ OPJ_BOOL opj_t2_encode_packets(opj_t2_t* p_t2,
l_nb_bytes = 0; l_nb_bytes = 0;
if (! opj_t2_encode_packet(p_tile_no, p_tile, l_tcp, l_current_pi, if (! opj_t2_encode_packet(p_tile_no, p_tile, l_tcp, l_current_pi,
l_current_data, &l_nb_bytes, p_max_len, cstr_info, p_manager)) { l_current_data, &l_nb_bytes, p_max_len,
cstr_info, p_t2_mode, p_manager)) {
opj_pi_destroy(l_pi, l_nb_pocs); opj_pi_destroy(l_pi, l_nb_pocs);
return OPJ_FALSE; return OPJ_FALSE;
} }
@ -602,6 +606,7 @@ static OPJ_BOOL opj_t2_encode_packet(OPJ_UINT32 tileno,
OPJ_UINT32 * p_data_written, OPJ_UINT32 * p_data_written,
OPJ_UINT32 length, OPJ_UINT32 length,
opj_codestream_info_t *cstr_info, opj_codestream_info_t *cstr_info,
J2K_T2_MODE p_t2_mode,
opj_event_mgr_t *p_manager) opj_event_mgr_t *p_manager)
{ {
OPJ_UINT32 bandno, cblkno; OPJ_UINT32 bandno, cblkno;
@ -851,10 +856,12 @@ static OPJ_BOOL opj_t2_encode_packet(OPJ_UINT32 tileno,
} }
if (layer->len > length) { if (layer->len > length) {
opj_event_msg(p_manager, EVT_ERROR, if (p_t2_mode == FINAL_PASS) {
"opj_t2_encode_packet(): only %u bytes remaining in " opj_event_msg(p_manager, EVT_ERROR,
"output buffer. %u needed.\n", "opj_t2_encode_packet(): only %u bytes remaining in "
length, layer->len); "output buffer. %u needed.\n",
length, layer->len);
}
return OPJ_FALSE; return OPJ_FALSE;
} }

2
src/lib/openjp2/t2.h
View File

@ -75,7 +75,7 @@ Encode the packets of a tile to a destination buffer
@param tpnum Tile part number of the current tile @param tpnum Tile part number of the current tile
@param tppos The position of the tile part flag in the progression order @param tppos The position of the tile part flag in the progression order
@param pino FIXME DOC @param pino FIXME DOC
@param t2_mode If == 0 In Threshold calculation ,If == 1 Final pass @param t2_mode If == THRESH_CALC In Threshold calculation ,If == FINAL_PASS Final pass
@param p_manager the user event manager @param p_manager the user event manager
*/ */
OPJ_BOOL opj_t2_encode_packets(opj_t2_t* t2, OPJ_BOOL opj_t2_encode_packets(opj_t2_t* t2,