projects
/
openjpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fd205f4
)
Revert "Avoid assertion in opj_j2k_merge_ppt() in case premature EOC is encountered...
author
Even Rouault
<even.rouault@spatialys.com>
Wed, 20 Jun 2018 12:38:41 +0000
(14:38 +0200)
committer
Even Rouault
<even.rouault@spatialys.com>
Wed, 20 Jun 2018 12:54:20 +0000
(14:54 +0200)
This reverts commit
9906fbf737692486cebabe98169988d818e2e66a
.
which broke decoding of images where TNsot == 0
src/lib/openjp2/j2k.c
patch
|
blob
|
history
diff --git
a/src/lib/openjp2/j2k.c
b/src/lib/openjp2/j2k.c
index 6e9cf8ce0a330041a91ac6816cb69ee9a86bbc2e..5109931fc254e3741497e0da8457454c7eec236c 100644
(file)
--- a/
src/lib/openjp2/j2k.c
+++ b/
src/lib/openjp2/j2k.c
@@
-8845,7
+8845,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 ???*/