Avoid assertion in opj_j2k_merge_ppt() in case premature EOC is encountered in opj_j2...

diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
index b192f04fa1e9ac63442467aa005e51e1d3d7d076..3d90de1ef82a690027f9a059b6be8a9021694264 100644 (file)
--- a/src/lib/openjp2/j2k.c
+++ b/src/lib/openjp2/j2k.c
@@ -8618,10 +8618,7 @@ 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) {
-        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;
-        }
+        p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_EOC;
     }
 
     /* FIXME DOC ???*/