diff options
| author | Antonin Descampe <antonin@gmail.com> | 2014-07-14 07:42:50 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2014-07-14 07:42:50 +0000 |
| commit | 2c810567dd9a01380da2b741afc2e21eb0d848e3 (patch) | |
| tree | 6a8db6e62176c1b11b19dd8f8a8eccbee50f2ce6 /src/lib | |
| parent | 0a1a29a7fe8b6d98a4bb95c2d4fa5371e223247c (diff) | |
[trunk] Changed error to warning when no EOC found in codestream (fixes
issue 366)
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/openjp2/j2k.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index 5fd743de..cb68e834 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -7783,13 +7783,13 @@ OPJ_BOOL opj_j2k_decode_tile ( opj_j2k_t * p_j2k, p_j2k->m_specific_param.m_decoder.m_state = 0x0100;/*FIXME J2K_DEC_STATE_EOC;*/ } else if (l_current_marker != J2K_MS_SOT) - { - opj_event_msg(p_manager, EVT_ERROR, "Stream too short, expected SOT\n"); - + { if(opj_stream_get_number_byte_left(p_stream) == 0) { p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_NEOC; + opj_event_msg(p_manager, EVT_WARNING, "Stream does not end with EOC\n"); return OPJ_TRUE; } + opj_event_msg(p_manager, EVT_ERROR, "Stream too short, expected SOT\n"); return OPJ_FALSE; } } |
