diff --git a/abi-check/abi_dump/openjpeg/current/ef225/ABI.dump b/abi-check/abi_dump/openjpeg/current/ef225/ABI.dump
index 3a407bd6..9e7445e6 100644
--- a/abi-check/abi_dump/openjpeg/current/ef225/ABI.dump
+++ b/abi-check/abi_dump/openjpeg/current/ef225/ABI.dump
@@ -207,7 +207,7 @@ $VAR1 = {
'Source' => 'cio.c',
'SourceLine' => '271'
},
- '171896' => {
+ '171868' => {
'Header' => 'openjpeg.h',
'Line' => '1096',
'Return' => '156',
@@ -215,13 +215,13 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '160'
},
- '172216' => {
+ '172188' => {
'Header' => 'openjpeg.h',
'Line' => '1621',
'Param' => {
'0' => {
'name' => 'cstr_info',
- 'type' => '172234'
+ 'type' => '172206'
}
},
'Reg' => {
@@ -232,12 +232,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '966'
},
- '234568' => {
+ '234484' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'p_callback',
@@ -258,12 +258,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '44'
},
- '234666' => {
+ '234582' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'p_callback',
@@ -284,12 +284,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '59'
},
- '234752' => {
+ '234668' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'p_callback',
@@ -310,28 +310,28 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '74'
},
- '234867' => {
+ '234783' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_format',
- 'type' => '223626'
+ 'type' => '223570'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '234654',
+ 'Return' => '234570',
'ShortName' => 'opj_create_decompress',
'Source' => 'openjpeg.c',
'SourceLine' => '168'
},
- '235089' => {
+ '235005' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'parameters',
- 'type' => '76863'
+ 'type' => '76835'
}
},
'Reg' => {
@@ -342,12 +342,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '364'
},
- '235220' => {
+ '235136' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'num_threads',
@@ -363,16 +363,16 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '387'
},
- '235338' => {
+ '235254' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'parameters',
- 'type' => '76863'
+ 'type' => '76835'
}
},
'Reg' => {
@@ -384,7 +384,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '398'
},
- '235480' => {
+ '235396' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -393,11 +393,11 @@ $VAR1 = {
},
'1' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'2' => {
'name' => 'p_image',
- 'type' => '76857'
+ 'type' => '76829'
}
},
'Reg' => {
@@ -410,12 +410,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '418'
},
- '235683' => {
+ '235599' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'numcomps',
@@ -423,7 +423,7 @@ $VAR1 = {
},
'2' => {
'name' => 'comps_indices',
- 'type' => '76875'
+ 'type' => '76847'
},
'3' => {
'name' => 'apply_color_transforms',
@@ -441,12 +441,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '442'
},
- '235925' => {
+ '235841' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'p_stream',
@@ -467,12 +467,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '471'
},
- '236079' => {
+ '235995' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'p_image',
@@ -508,12 +508,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '492'
},
- '236287' => {
+ '236203' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'p_stream',
@@ -569,12 +569,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '515'
},
- '236493' => {
+ '236409' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'p_tile_index',
@@ -605,12 +605,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '546'
},
- '236693' => {
+ '236609' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'p_stream',
@@ -636,12 +636,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '572'
},
- '236870' => {
+ '236786' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'res_factor',
@@ -657,28 +657,28 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '596'
},
- '236979' => {
+ '236895' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_format',
- 'type' => '223626'
+ 'type' => '223570'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '234654',
+ 'Return' => '234570',
'ShortName' => 'opj_create_compress',
'Source' => 'openjpeg.c',
'SourceLine' => '614'
},
- '237204' => {
+ '237120' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'parameters',
- 'type' => '76886'
+ 'type' => '76858'
}
},
'Reg' => {
@@ -689,16 +689,16 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '712'
},
- '237335' => {
+ '237251' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'parameters',
- 'type' => '76886'
+ 'type' => '76858'
},
'2' => {
'name' => 'p_image',
@@ -715,12 +715,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '773'
},
- '237473' => {
+ '237389' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'p_image',
@@ -741,12 +741,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '791'
},
- '237627' => {
+ '237543' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_info',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'p_stream',
@@ -762,12 +762,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '810'
},
- '237758' => {
+ '237674' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'p_stream',
@@ -783,12 +783,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '827'
},
- '237889' => {
+ '237805' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'p_stream',
@@ -804,12 +804,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '844'
},
- '238020' => {
+ '237936' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'parameters',
- 'type' => '76886'
+ 'type' => '76858'
},
'1' => {
'name' => 'pEncodingMatrix',
@@ -835,12 +835,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '864'
},
- '238366' => {
+ '238282' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'p_tile_index',
@@ -871,12 +871,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '894'
},
- '238566' => {
+ '238482' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
}
},
'Reg' => {
@@ -887,12 +887,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '921'
},
- '238667' => {
+ '238583' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
},
'1' => {
'name' => 'info_flag',
@@ -900,7 +900,7 @@ $VAR1 = {
},
'2' => {
'name' => 'output_stream',
- 'type' => '76892'
+ 'type' => '76864'
}
},
'Reg' => {
@@ -913,44 +913,44 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '939'
},
- '238804' => {
+ '238720' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '76898',
+ 'Return' => '76870',
'ShortName' => 'opj_get_cstr_info',
'Source' => 'openjpeg.c',
'SourceLine' => '955'
},
- '238968' => {
+ '238884' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '234654'
+ 'type' => '234570'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '74676',
+ 'Return' => '74648',
'ShortName' => 'opj_get_cstr_index',
'Source' => 'openjpeg.c',
'SourceLine' => '983'
},
- '239053' => {
+ '238969' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_cstr_index',
- 'type' => '239113'
+ 'type' => '239029'
}
},
'Reg' => {
@@ -961,7 +961,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '994'
},
- '239119' => {
+ '239035' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -987,7 +987,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '1009'
},
- '239238' => {
+ '239154' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -1418,8 +1418,8 @@ $VAR1 = {
'Size' => '1',
'Type' => 'Const'
},
- '172234' => {
- 'BaseType' => '76898',
+ '172206' => {
+ 'BaseType' => '76870',
'Name' => 'opj_codestream_info_v2_t**',
'Size' => '8',
'Type' => 'Pointer'
@@ -1911,7 +1911,7 @@ $VAR1 = {
'Size' => '8',
'Type' => 'Pointer'
},
- '223576' => {
+ '223520' => {
'Header' => 'openjpeg.h',
'Line' => '322',
'Memb' => {
@@ -1944,19 +1944,19 @@ $VAR1 = {
'Size' => '4',
'Type' => 'Enum'
},
- '2236' => {
- 'Name' => 'float',
- 'Size' => '4',
- 'Type' => 'Intrinsic'
- },
- '223626' => {
- 'BaseType' => '223576',
+ '223570' => {
+ 'BaseType' => '223520',
'Header' => 'openjpeg.h',
'Line' => '329',
'Name' => 'OPJ_CODEC_FORMAT',
'Size' => '4',
'Type' => 'Typedef'
},
+ '2236' => {
+ 'Name' => 'float',
+ 'Size' => '4',
+ 'Type' => 'Intrinsic'
+ },
'2243' => {
'Name' => 'double',
'Size' => '8',
@@ -2117,7 +2117,7 @@ $VAR1 = {
'Size' => '216',
'Type' => 'Struct'
},
- '225383' => {
+ '225327' => {
'BaseType' => '130',
'Header' => 'openjpeg.h',
'Line' => '612',
@@ -2137,14 +2137,14 @@ $VAR1 = {
'Size' => '4',
'Type' => 'Const'
},
- '234654' => {
- 'BaseType' => '225383',
+ '234570' => {
+ 'BaseType' => '225327',
'Name' => 'opj_codec_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '239113' => {
- 'BaseType' => '74676',
+ '239029' => {
+ 'BaseType' => '74648',
'Name' => 'opj_codestream_index_t**',
'Size' => '8',
'Type' => 'Pointer'
@@ -3297,43 +3297,43 @@ $VAR1 = {
'Size' => '1',
'Type' => 'Intrinsic'
},
- '74676' => {
+ '74648' => {
'BaseType' => '71699',
'Name' => 'opj_codestream_index_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '76857' => {
+ '76829' => {
'BaseType' => '21147',
'Name' => 'opj_image_t**',
'Size' => '8',
'Type' => 'Pointer'
},
- '76863' => {
+ '76835' => {
'BaseType' => '69500',
'Name' => 'opj_dparameters_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '76875' => {
+ '76847' => {
'BaseType' => '23281',
'Name' => 'OPJ_UINT32 const*',
'Size' => '8',
'Type' => 'Pointer'
},
- '76886' => {
+ '76858' => {
'BaseType' => '69238',
'Name' => 'opj_cparameters_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '76892' => {
+ '76864' => {
'BaseType' => '66818',
'Name' => 'FILE*',
'Size' => '8',
'Type' => 'Pointer'
},
- '76898' => {
+ '76870' => {
'BaseType' => '71336',
'Name' => 'opj_codestream_info_v2_t*',
'Size' => '8',
diff --git a/abi-check/changelog/openjpeg/current/log.html b/abi-check/changelog/openjpeg/current/log.html
index 1fabfbfc..e9528994 100644
--- a/abi-check/changelog/openjpeg/current/log.html
+++ b/abi-check/changelog/openjpeg/current/log.html
@@ -20,7 +20,13 @@
commit 774889a328abd5d3c280d9a897f1ac4c672cb0e5 +commit 64689d05dfaaf52105581d93fb1eb173b20829a4 +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2020-04-18 18:25:44 +0200 + + struct opj_j2k: remove unused fields, and add some documentation + +commit 774889a328abd5d3c280d9a897f1ac4c672cb0e5 Merge: b6b7e96 271a71e Author: Even Rouault <even.rouault@spatialys.com> Date: 2020-04-17 00:39:46 +0200 @@ -884,12 +890,6 @@ 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 - ...