diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2018-06-20 16:26:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-20 16:26:24 +0200 |
| commit | d2205ba2ee78faeea659263383446c4472b1f9df (patch) | |
| tree | f08d189180dfc64787c84dc837bfe41e253c328f /src | |
| parent | fd205f457b157e925e2a6eb03aba397b45b0ed4e (diff) | |
| parent | 4170681661126bc9c1348a0183633dc2f4fc8b05 (diff) | |
Merge pull request #1121 from rouault/fix_tnsot_zero
Fix regression in reading files with TNsot == 0 (refs #1120)
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/openjp2/j2k.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index 6e9cf8ce..28c7513f 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -4094,7 +4094,12 @@ static OPJ_BOOL opj_j2k_merge_ppt(opj_tcp_t *p_tcp, opj_event_mgr_t * p_manager) /* preconditions */ assert(p_tcp != 00); assert(p_manager != 00); - assert(p_tcp->ppt_buffer == NULL); + + if (p_tcp->ppt_buffer != NULL) { + opj_event_msg(p_manager, EVT_ERROR, + "opj_j2k_merge_ppt() has already been called\n"); + return OPJ_FALSE; + } if (p_tcp->ppt == 0U) { return OPJ_TRUE; @@ -8845,7 +8850,10 @@ OPJ_BOOL opj_j2k_read_tile_header(opj_j2k_t * p_j2k, /* Current marker is the EOC marker ?*/ if (l_current_marker == J2K_MS_EOC) { - p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_EOC; + if (p_j2k->m_specific_param.m_decoder.m_state != J2K_STATE_EOC) { + p_j2k->m_current_tile_number = 0; + p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_EOC; + } } /* FIXME DOC ???*/ |