diff --git a/abi-check/abi_dump/openjpeg/current/9bc2e/ABI.dump b/abi-check/abi_dump/openjpeg/current/9bc2e/ABI.dump
index e4532c48..131858cd 100644
--- a/abi-check/abi_dump/openjpeg/current/9bc2e/ABI.dump
+++ b/abi-check/abi_dump/openjpeg/current/9bc2e/ABI.dump
@@ -207,7 +207,7 @@ $VAR1 = {
'Source' => 'cio.c',
'SourceLine' => '271'
},
- '169214' => {
+ '169192' => {
'Header' => 'openjpeg.h',
'Line' => '1062',
'Return' => '156',
@@ -215,13 +215,13 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '160'
},
- '169534' => {
+ '169512' => {
'Header' => 'openjpeg.h',
'Line' => '1587',
'Param' => {
'0' => {
'name' => 'cstr_info',
- 'type' => '169552'
+ 'type' => '169530'
}
},
'Reg' => {
@@ -232,12 +232,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '966'
},
- '231923' => {
+ '231901' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'p_callback',
@@ -258,12 +258,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '44'
},
- '232021' => {
+ '231999' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'p_callback',
@@ -284,12 +284,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '59'
},
- '232107' => {
+ '232085' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'p_callback',
@@ -310,23 +310,23 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '74'
},
- '232222' => {
+ '232200' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_format',
- 'type' => '220981'
+ 'type' => '220959'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '232009',
+ 'Return' => '231987',
'ShortName' => 'opj_create_decompress',
'Source' => 'openjpeg.c',
'SourceLine' => '168'
},
- '232444' => {
+ '232422' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -342,12 +342,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '364'
},
- '232575' => {
+ '232553' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'num_threads',
@@ -363,12 +363,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '387'
},
- '232693' => {
+ '232671' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'parameters',
@@ -384,7 +384,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '398'
},
- '232835' => {
+ '232813' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -393,7 +393,7 @@ $VAR1 = {
},
'1' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'2' => {
'name' => 'p_image',
@@ -410,12 +410,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '418'
},
- '233038' => {
+ '233016' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'numcomps',
@@ -441,12 +441,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '442'
},
- '233280' => {
+ '233258' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'p_stream',
@@ -467,12 +467,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '471'
},
- '233434' => {
+ '233412' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'p_image',
@@ -508,12 +508,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '492'
},
- '233642' => {
+ '233620' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'p_stream',
@@ -569,12 +569,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '515'
},
- '233860' => {
+ '233838' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'p_tile_index',
@@ -605,12 +605,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '546'
},
- '234060' => {
+ '234038' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'p_stream',
@@ -636,12 +636,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '572'
},
- '234237' => {
+ '234215' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'res_factor',
@@ -657,23 +657,23 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '596'
},
- '234346' => {
+ '234324' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_format',
- 'type' => '220981'
+ 'type' => '220959'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '232009',
+ 'Return' => '231987',
'ShortName' => 'opj_create_compress',
'Source' => 'openjpeg.c',
'SourceLine' => '614'
},
- '234571' => {
+ '234549' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -689,12 +689,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '712'
},
- '234702' => {
+ '234680' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'parameters',
@@ -715,12 +715,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '773'
},
- '234840' => {
+ '234818' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'p_image',
@@ -741,12 +741,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '791'
},
- '234994' => {
+ '234972' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_info',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'p_stream',
@@ -762,12 +762,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '810'
},
- '235125' => {
+ '235103' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'p_stream',
@@ -783,12 +783,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '827'
},
- '235256' => {
+ '235234' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'p_stream',
@@ -804,7 +804,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '844'
},
- '235387' => {
+ '235365' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -835,12 +835,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '864'
},
- '235733' => {
+ '235711' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'p_tile_index',
@@ -871,12 +871,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '894'
},
- '235933' => {
+ '235911' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
}
},
'Reg' => {
@@ -887,12 +887,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '921'
},
- '236034' => {
+ '236012' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
},
'1' => {
'name' => 'info_flag',
@@ -913,12 +913,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '939'
},
- '236171' => {
+ '236149' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
}
},
'Reg' => {
@@ -929,12 +929,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '955'
},
- '236335' => {
+ '236313' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232009'
+ 'type' => '231987'
}
},
'Reg' => {
@@ -945,12 +945,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '983'
},
- '236420' => {
+ '236398' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_cstr_index',
- 'type' => '236480'
+ 'type' => '236458'
}
},
'Reg' => {
@@ -961,7 +961,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '994'
},
- '236486' => {
+ '236464' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -987,7 +987,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '1009'
},
- '236605' => {
+ '236583' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -1418,7 +1418,7 @@ $VAR1 = {
'Size' => '1',
'Type' => 'Const'
},
- '169552' => {
+ '169530' => {
'BaseType' => '76931',
'Name' => 'opj_codestream_info_v2_t**',
'Size' => '8',
@@ -1911,7 +1911,7 @@ $VAR1 = {
'Size' => '8',
'Type' => 'Pointer'
},
- '220931' => {
+ '220909' => {
'Header' => 'openjpeg.h',
'Line' => '292',
'Memb' => {
@@ -1944,15 +1944,15 @@ $VAR1 = {
'Size' => '4',
'Type' => 'Enum'
},
- '220981' => {
- 'BaseType' => '220931',
+ '220959' => {
+ 'BaseType' => '220909',
'Header' => 'openjpeg.h',
'Line' => '299',
'Name' => 'OPJ_CODEC_FORMAT',
'Size' => '4',
'Type' => 'Typedef'
},
- '222738' => {
+ '222716' => {
'BaseType' => '130',
'Header' => 'openjpeg.h',
'Line' => '578',
@@ -2125,8 +2125,8 @@ $VAR1 = {
'Size' => '216',
'Type' => 'Struct'
},
- '232009' => {
- 'BaseType' => '222738',
+ '231987' => {
+ 'BaseType' => '222716',
'Name' => 'opj_codec_t*',
'Size' => '8',
'Type' => 'Pointer'
@@ -2143,7 +2143,7 @@ $VAR1 = {
'Size' => '4',
'Type' => 'Const'
},
- '236480' => {
+ '236458' => {
'BaseType' => '74709',
'Name' => 'opj_codestream_index_t**',
'Size' => '8',
diff --git a/abi-check/changelog/openjpeg/current/log.html b/abi-check/changelog/openjpeg/current/log.html
index c6427c50..9999860b 100644
--- a/abi-check/changelog/openjpeg/current/log.html
+++ b/abi-check/changelog/openjpeg/current/log.html
@@ -20,7 +20,37 @@
commit fd205f457b157e925e2a6eb03aba397b45b0ed4e +commit d2205ba2ee78faeea659263383446c4472b1f9df +Merge: fd205f4 4170681 +Author: Even Rouault <even.rouault@mines-paris.org> +Date: 2018-06-20 16:26:24 +0200 + + Merge pull request #1121 from rouault/fix_tnsot_zero + + Fix regression in reading files with TNsot == 0 (refs #1120) + +commit 4170681661126bc9c1348a0183633dc2f4fc8b05 +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2018-06-20 15:06:16 +0200 + + Add test cases for https://github.com/uclouvain/openjpeg/issues/1120 and https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2785 + +commit 0c913b0aba409148b51ca43d45c50ae595449723 +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2018-06-20 14:54:09 +0200 + + Avoid assertion when running opj_j2k_merge_ppt() several time due to e6674f7ed66abdb32a0be5944f618722b6a7b5d5 revert. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2785 + +commit 832dfd18665da08745748bde2d2563f00c7cd9e7 +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2018-06-20 14:38:41 +0200 + + Revert "Avoid assertion in opj_j2k_merge_ppt() in case premature EOC is encountered in opj_j2k_read_tile_header(). Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2785. Credit to OSS Fuzz" (fixes #1120) + + This reverts commit 9906fbf737692486cebabe98169988d818e2e66a. + which broke decoding of images where TNsot == 0 + +commit fd205f457b157e925e2a6eb03aba397b45b0ed4e Author: Even Rouault <even.rouault@spatialys.com> Date: 2018-06-16 16:17:58 +0200 @@ -682,12 +712,6 @@ Date: 2017-09-01 21:17:26 +0200 opj_t1_clbl_decode_processor(): use SSE2 in subtile decoding code path, for irreversible -commit 2c365fe0ecc8c6597db491a953a91308b1d0d4b1 -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-09-01 20:43:39 +0200 - - Replace error message 'Not enough memory for tile data' by 'Size of tile data exceeds system limits' (refs https://github.com/uclouvain/openjpeg/pull/730#issuecomment-326654188) - commit b428b8c7e7227cf96c83229df4d7bf009b6d2172 Author: Even Rouault <even.rouault@spatialys.com> Date: 2017-09-01 20:01:39 +0200 @@ -702,12 +726,6 @@ Date: 2017-09-01 19:49:01 +0200 opj_j2k_setup_encoder(): emit warnings if tcp_rates are not decreasing or tcp_distoratio are not increasing (#1009) -commit a538815c774db94a0d3fa323c9ca4f456ef04903 -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-09-01 19:27:56 +0200 - - opj_j2k_setup_encoder(): avoid potential int overflow in computations related to max_cs_size - ...