diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2017-08-16 12:52:33 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2017-08-16 12:52:33 +0200 |
| commit | 9624b2fa4722edf77fbac631e7dacaae12c91672 (patch) | |
| tree | 958366ccd25936bf3a66f93f315499eb90a88442 /src/lib | |
| parent | 4241ae6fbbf1de9658764a80944dc8108f2b4154 (diff) | |
opj_t2_encode_packet(): only emit an error about insufficiently large output buffer in FINAL_PASS mode. Fixes (master-only) regression added in 0b4fef6d1901254e41ab74ed681daba477d724c3
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/openjp2/t2.c | 17 | ||||
| -rw-r--r-- | src/lib/openjp2/t2.h | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/lib/openjp2/t2.c b/src/lib/openjp2/t2.c index 198960fc..9d31acda 100644 --- a/src/lib/openjp2/t2.c +++ b/src/lib/openjp2/t2.c @@ -68,6 +68,7 @@ Encode a packet of a tile to a destination buffer @param p_data_written FIXME DOC @param len Length of the destination buffer @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 @return */ @@ -79,6 +80,7 @@ static OPJ_BOOL opj_t2_encode_packet(OPJ_UINT32 tileno, OPJ_UINT32 * p_data_written, OPJ_UINT32 len, opj_codestream_info_t *cstr_info, + J2K_T2_MODE p_t2_mode, 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, l_current_data, &l_nb_bytes, p_max_len, cstr_info, + p_t2_mode, p_manager)) { opj_pi_destroy(l_pi, l_nb_pocs); return OPJ_FALSE; @@ -311,7 +314,8 @@ OPJ_BOOL opj_t2_encode_packets(opj_t2_t* p_t2, l_nb_bytes = 0; 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); return OPJ_FALSE; } @@ -602,6 +606,7 @@ static OPJ_BOOL opj_t2_encode_packet(OPJ_UINT32 tileno, OPJ_UINT32 * p_data_written, OPJ_UINT32 length, opj_codestream_info_t *cstr_info, + J2K_T2_MODE p_t2_mode, opj_event_mgr_t *p_manager) { OPJ_UINT32 bandno, cblkno; @@ -851,10 +856,12 @@ static OPJ_BOOL opj_t2_encode_packet(OPJ_UINT32 tileno, } if (layer->len > length) { - opj_event_msg(p_manager, EVT_ERROR, - "opj_t2_encode_packet(): only %u bytes remaining in " - "output buffer. %u needed.\n", - length, layer->len); + if (p_t2_mode == FINAL_PASS) { + opj_event_msg(p_manager, EVT_ERROR, + "opj_t2_encode_packet(): only %u bytes remaining in " + "output buffer. %u needed.\n", + length, layer->len); + } return OPJ_FALSE; } diff --git a/src/lib/openjp2/t2.h b/src/lib/openjp2/t2.h index a1994e82..111aa2de 100644 --- a/src/lib/openjp2/t2.h +++ b/src/lib/openjp2/t2.h @@ -75,7 +75,7 @@ Encode the packets of a tile to a destination buffer @param tpnum Tile part number of the current tile @param tppos The position of the tile part flag in the progression order @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 */ OPJ_BOOL opj_t2_encode_packets(opj_t2_t* t2, |