diff --git a/abi-check/abi_dump/openjpeg/current/2c999/ABI.dump b/abi-check/abi_dump/openjpeg/current/2c999/ABI.dump
index bd40ea40..e3d31b5a 100644
--- a/abi-check/abi_dump/openjpeg/current/2c999/ABI.dump
+++ b/abi-check/abi_dump/openjpeg/current/2c999/ABI.dump
@@ -207,7 +207,7 @@ $VAR1 = {
'Source' => 'cio.c',
'SourceLine' => '271'
},
- '151252' => {
+ '151294' => {
'Header' => 'openjpeg.h',
'Line' => '1058',
'Return' => '177',
@@ -215,13 +215,13 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '160'
},
- '151537' => {
+ '151579' => {
'Header' => 'openjpeg.h',
'Line' => '1515',
'Param' => {
'0' => {
'name' => 'cstr_info',
- 'type' => '151555'
+ 'type' => '151597'
}
},
'Reg' => {
@@ -232,12 +232,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '924'
},
- '212761' => {
+ '212803' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
},
'1' => {
'name' => 'p_callback',
@@ -258,12 +258,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '44'
},
- '212859' => {
+ '212901' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
},
'1' => {
'name' => 'p_callback',
@@ -284,12 +284,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '59'
},
- '212945' => {
+ '212987' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
},
'1' => {
'name' => 'p_callback',
@@ -310,23 +310,23 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '74'
},
- '213060' => {
+ '213102' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_format',
- 'type' => '202246'
+ 'type' => '202288'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '212847',
+ 'Return' => '212889',
'ShortName' => 'opj_create_decompress',
'Source' => 'openjpeg.c',
'SourceLine' => '168'
},
- '213282' => {
+ '213324' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -342,12 +342,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '352'
},
- '213413' => {
+ '213455' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
},
'1' => {
'name' => 'num_threads',
@@ -363,12 +363,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '375'
},
- '213531' => {
+ '213573' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
},
'1' => {
'name' => 'parameters',
@@ -384,7 +384,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '386'
},
- '213673' => {
+ '213715' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -393,7 +393,7 @@ $VAR1 = {
},
'1' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
},
'2' => {
'name' => 'p_image',
@@ -410,12 +410,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '406'
},
- '213876' => {
+ '213918' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
},
'1' => {
'name' => 'p_stream',
@@ -436,12 +436,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '429'
},
- '214030' => {
+ '214072' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
},
'1' => {
'name' => 'p_image',
@@ -477,12 +477,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '450'
},
- '214238' => {
+ '214280' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
},
'1' => {
'name' => 'p_stream',
@@ -538,12 +538,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '473'
},
- '214456' => {
+ '214498' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
},
'1' => {
'name' => 'p_tile_index',
@@ -574,12 +574,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '504'
},
- '214656' => {
+ '214698' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
},
'1' => {
'name' => 'p_stream',
@@ -605,12 +605,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '530'
},
- '214833' => {
+ '214875' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
},
'1' => {
'name' => 'res_factor',
@@ -626,23 +626,23 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '554'
},
- '214942' => {
+ '214984' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_format',
- 'type' => '202246'
+ 'type' => '202288'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '212847',
+ 'Return' => '212889',
'ShortName' => 'opj_create_compress',
'Source' => 'openjpeg.c',
'SourceLine' => '572'
},
- '215167' => {
+ '215209' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -658,12 +658,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '670'
},
- '215298' => {
+ '215340' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
},
'1' => {
'name' => 'parameters',
@@ -684,12 +684,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '731'
},
- '215436' => {
+ '215478' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
},
'1' => {
'name' => 'p_image',
@@ -710,12 +710,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '749'
},
- '215590' => {
+ '215632' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_info',
- 'type' => '212847'
+ 'type' => '212889'
},
'1' => {
'name' => 'p_stream',
@@ -731,12 +731,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '768'
},
- '215721' => {
+ '215763' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
},
'1' => {
'name' => 'p_stream',
@@ -752,12 +752,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '785'
},
- '215852' => {
+ '215894' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
},
'1' => {
'name' => 'p_stream',
@@ -773,7 +773,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '802'
},
- '215983' => {
+ '216025' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -804,12 +804,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '822'
},
- '216329' => {
+ '216371' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
},
'1' => {
'name' => 'p_tile_index',
@@ -840,12 +840,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '852'
},
- '216529' => {
+ '216571' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
}
},
'Reg' => {
@@ -856,12 +856,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '879'
},
- '216630' => {
+ '216672' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
},
'1' => {
'name' => 'info_flag',
@@ -882,12 +882,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '897'
},
- '216767' => {
+ '216809' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
}
},
'Reg' => {
@@ -898,12 +898,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '913'
},
- '216931' => {
+ '216973' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '212847'
+ 'type' => '212889'
}
},
'Reg' => {
@@ -914,12 +914,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '941'
},
- '217016' => {
+ '217058' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_cstr_index',
- 'type' => '217076'
+ 'type' => '217118'
}
},
'Reg' => {
@@ -930,7 +930,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '952'
},
- '217082' => {
+ '217124' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -956,7 +956,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '967'
},
- '217201' => {
+ '217243' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -1335,7 +1335,7 @@ $VAR1 = {
'Size' => '1',
'Type' => 'Intrinsic'
},
- '151555' => {
+ '151597' => {
'BaseType' => '60621',
'Name' => 'opj_codestream_info_v2_t**',
'Size' => '8',
@@ -1530,7 +1530,7 @@ $VAR1 = {
'Size' => '216',
'Type' => 'Struct'
},
- '202196' => {
+ '202238' => {
'Header' => 'openjpeg.h',
'Line' => '292',
'Memb' => {
@@ -1563,15 +1563,15 @@ $VAR1 = {
'Size' => '4',
'Type' => 'Enum'
},
- '202246' => {
- 'BaseType' => '202196',
+ '202288' => {
+ 'BaseType' => '202238',
'Header' => 'openjpeg.h',
'Line' => '299',
'Name' => 'OPJ_CODEC_FORMAT',
'Size' => '4',
'Type' => 'Typedef'
},
- '204003' => {
+ '204045' => {
'BaseType' => '141',
'Header' => 'openjpeg.h',
'Line' => '574',
@@ -1579,13 +1579,13 @@ $VAR1 = {
'Size' => '8',
'Type' => 'Typedef'
},
- '212847' => {
- 'BaseType' => '204003',
+ '212889' => {
+ 'BaseType' => '204045',
'Name' => 'opj_codec_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '217076' => {
+ '217118' => {
'BaseType' => '58649',
'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 b0f51a60..bac0fb61 100644
--- a/abi-check/changelog/openjpeg/current/log.html
+++ b/abi-check/changelog/openjpeg/current/log.html
@@ -20,7 +20,13 @@
commit 155fc2e279b85bd04709967b2797de4f69b0cf3e +commit 2fbd4bb0b9c6178f12c852dc40db6ab05734bfe2 +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2017-08-04 18:01:29 +0200 + + opj_j2k_read_sot(): check current TPSot number regarding previous (non-zero) TNsot to avoid opj_j2k_merge_ppt() to be called several times. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2851. Credit to OSS Fuzz + +commit 155fc2e279b85bd04709967b2797de4f69b0cf3e Author: Antonin Descampe <antonin@gmail.com> Date: 2017-08-02 17:07:29 +0200 @@ -374,12 +380,6 @@ Date: 2017-07-05 21:33:42 +0200 Remove unused m_DA_x0, m_DA_y0, m_DA_x1, m_DA_y1 members from opj_j2k_dec structure -commit 1a8eac6a90ca61f3703f9b97afc2ec4918f0ab55 -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-07-03 14:14:03 +0200 - - Add tests/fuzzers for OSS Fuzz (#965) - ...