diff --git a/abi-check/abi_dump/openjpeg/current/2c999/ABI.dump b/abi-check/abi_dump/openjpeg/current/2c999/ABI.dump
index a03ca916..5790c47a 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'
},
- '152247' => {
+ '152249' => {
'Header' => 'openjpeg.h',
'Line' => '1059',
'Return' => '177',
@@ -215,13 +215,13 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '160'
},
- '152550' => {
+ '152552' => {
'Header' => 'openjpeg.h',
'Line' => '1537',
'Param' => {
'0' => {
'name' => 'cstr_info',
- 'type' => '152568'
+ 'type' => '152570'
}
},
'Reg' => {
@@ -232,12 +232,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '924'
},
- '214162' => {
+ '214166' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
},
'1' => {
'name' => 'p_callback',
@@ -258,12 +258,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '44'
},
- '214260' => {
+ '214264' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
},
'1' => {
'name' => 'p_callback',
@@ -284,12 +284,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '59'
},
- '214346' => {
+ '214350' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
},
'1' => {
'name' => 'p_callback',
@@ -310,28 +310,28 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '74'
},
- '214461' => {
+ '214465' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_format',
- 'type' => '203515'
+ 'type' => '203518'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '214248',
+ 'Return' => '214252',
'ShortName' => 'opj_create_decompress',
'Source' => 'openjpeg.c',
'SourceLine' => '168'
},
- '214683' => {
+ '214687' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'parameters',
- 'type' => '60928'
+ 'type' => '60930'
}
},
'Reg' => {
@@ -342,12 +342,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '352'
},
- '214814' => {
+ '214818' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
},
'1' => {
'name' => 'num_threads',
@@ -363,16 +363,16 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '375'
},
- '214932' => {
+ '214936' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
},
'1' => {
'name' => 'parameters',
- 'type' => '60928'
+ 'type' => '60930'
}
},
'Reg' => {
@@ -384,7 +384,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '386'
},
- '215074' => {
+ '215078' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -393,11 +393,11 @@ $VAR1 = {
},
'1' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
},
'2' => {
'name' => 'p_image',
- 'type' => '60916'
+ 'type' => '60918'
}
},
'Reg' => {
@@ -410,12 +410,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '406'
},
- '215277' => {
+ '215281' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
},
'1' => {
'name' => 'p_stream',
@@ -436,12 +436,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '429'
},
- '215431' => {
+ '215435' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
},
'1' => {
'name' => 'p_image',
@@ -477,12 +477,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '450'
},
- '215639' => {
+ '215643' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
},
'1' => {
'name' => 'p_stream',
@@ -519,7 +519,7 @@ $VAR1 = {
},
'9' => {
'name' => 'p_should_go_on',
- 'type' => '60922'
+ 'type' => '60924'
}
},
'Reg' => {
@@ -538,12 +538,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '473'
},
- '215857' => {
+ '215861' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
},
'1' => {
'name' => 'p_tile_index',
@@ -574,12 +574,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '504'
},
- '216057' => {
+ '216061' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
},
'1' => {
'name' => 'p_stream',
@@ -605,12 +605,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '530'
},
- '216234' => {
+ '216238' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
},
'1' => {
'name' => 'res_factor',
@@ -626,28 +626,28 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '554'
},
- '216343' => {
+ '216347' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_format',
- 'type' => '203515'
+ 'type' => '203518'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '214248',
+ 'Return' => '214252',
'ShortName' => 'opj_create_compress',
'Source' => 'openjpeg.c',
'SourceLine' => '572'
},
- '216568' => {
+ '216572' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'parameters',
- 'type' => '60940'
+ 'type' => '60942'
}
},
'Reg' => {
@@ -658,16 +658,16 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '670'
},
- '216699' => {
+ '216703' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
},
'1' => {
'name' => 'parameters',
- 'type' => '60940'
+ 'type' => '60942'
},
'2' => {
'name' => 'p_image',
@@ -684,12 +684,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '731'
},
- '216837' => {
+ '216841' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
},
'1' => {
'name' => 'p_image',
@@ -710,12 +710,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '749'
},
- '216991' => {
+ '216995' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_info',
- 'type' => '214248'
+ 'type' => '214252'
},
'1' => {
'name' => 'p_stream',
@@ -731,12 +731,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '768'
},
- '217122' => {
+ '217126' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
},
'1' => {
'name' => 'p_stream',
@@ -752,12 +752,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '785'
},
- '217253' => {
+ '217257' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
},
'1' => {
'name' => 'p_stream',
@@ -773,12 +773,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '802'
},
- '217384' => {
+ '217388' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'parameters',
- 'type' => '60940'
+ 'type' => '60942'
},
'1' => {
'name' => 'pEncodingMatrix',
@@ -804,12 +804,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '822'
},
- '217730' => {
+ '217734' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
},
'1' => {
'name' => 'p_tile_index',
@@ -840,12 +840,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '852'
},
- '217930' => {
+ '217934' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
}
},
'Reg' => {
@@ -856,12 +856,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '879'
},
- '218031' => {
+ '218035' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
},
'1' => {
'name' => 'info_flag',
@@ -869,7 +869,7 @@ $VAR1 = {
},
'2' => {
'name' => 'output_stream',
- 'type' => '60946'
+ 'type' => '60948'
}
},
'Reg' => {
@@ -882,28 +882,28 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '897'
},
- '218168' => {
+ '218172' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '60952',
+ 'Return' => '60954',
'ShortName' => 'opj_get_cstr_info',
'Source' => 'openjpeg.c',
'SourceLine' => '913'
},
- '218332' => {
+ '218336' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '214248'
+ 'type' => '214252'
}
},
'Reg' => {
@@ -914,12 +914,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '941'
},
- '218417' => {
+ '218421' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_cstr_index',
- 'type' => '218477'
+ 'type' => '218481'
}
},
'Reg' => {
@@ -930,7 +930,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '952'
},
- '218483' => {
+ '218487' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -956,7 +956,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '967'
},
- '218602' => {
+ '218606' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -1371,8 +1371,8 @@ $VAR1 = {
'Size' => '1',
'Type' => 'Intrinsic'
},
- '152568' => {
- 'BaseType' => '60952',
+ '152570' => {
+ 'BaseType' => '60954',
'Name' => 'opj_codestream_info_v2_t**',
'Size' => '8',
'Type' => 'Pointer'
@@ -1566,7 +1566,7 @@ $VAR1 = {
'Size' => '216',
'Type' => 'Struct'
},
- '203465' => {
+ '203468' => {
'Header' => 'openjpeg.h',
'Line' => '292',
'Memb' => {
@@ -1599,15 +1599,15 @@ $VAR1 = {
'Size' => '4',
'Type' => 'Enum'
},
- '203515' => {
- 'BaseType' => '203465',
+ '203518' => {
+ 'BaseType' => '203468',
'Header' => 'openjpeg.h',
'Line' => '299',
'Name' => 'OPJ_CODEC_FORMAT',
'Size' => '4',
'Type' => 'Typedef'
},
- '205272' => {
+ '205275' => {
'BaseType' => '141',
'Header' => 'openjpeg.h',
'Line' => '575',
@@ -1615,13 +1615,13 @@ $VAR1 = {
'Size' => '8',
'Type' => 'Typedef'
},
- '214248' => {
- 'BaseType' => '205272',
+ '214252' => {
+ 'BaseType' => '205275',
'Name' => 'opj_codec_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '218477' => {
+ '218481' => {
'BaseType' => '58944',
'Name' => 'opj_codestream_index_t**',
'Size' => '8',
@@ -3206,37 +3206,37 @@ $VAR1 = {
'Size' => '24',
'Type' => 'Struct'
},
- '60916' => {
+ '60918' => {
'BaseType' => '45024',
'Name' => 'opj_image_t**',
'Size' => '8',
'Type' => 'Pointer'
},
- '60922' => {
+ '60924' => {
'BaseType' => '701',
'Name' => 'OPJ_BOOL*',
'Size' => '8',
'Type' => 'Pointer'
},
- '60928' => {
+ '60930' => {
'BaseType' => '53802',
'Name' => 'opj_dparameters_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '60940' => {
+ '60942' => {
'BaseType' => '53540',
'Name' => 'opj_cparameters_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '60946' => {
+ '60948' => {
'BaseType' => '51122',
'Name' => 'FILE*',
'Size' => '8',
'Type' => 'Pointer'
},
- '60952' => {
+ '60954' => {
'BaseType' => '55638',
'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 2a4afa6f..37d0d539 100644
--- a/abi-check/changelog/openjpeg/current/log.html
+++ b/abi-check/changelog/openjpeg/current/log.html
@@ -20,7 +20,13 @@
commit 11b1ffb373d8e41705348080ba5e74a4ffe4148c +commit 9203e8ec51a1c1c1a358a9cbafdf3391549ebc80 +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2017-08-09 14:50:59 +0200 + + tcd.h: doc fixes and improvements + +commit 11b1ffb373d8e41705348080ba5e74a4ffe4148c Author: Even Rouault <even.rouault@spatialys.com> Date: 2017-08-09 14:13:58 +0200 @@ -595,16 +601,6 @@ Date: 2017-07-26 20:13:09 +0200 opj_decompress: fix null pointer dereference on comps[].data on id_000167,sig_11,src_006079,op_havoc,rep_4 (#939) -commit 8d2e69e37d01bf6a0440d3109d92235c3c586ffe -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-07-26 19:49:38 +0200 - - Fix assertion / memory leak in opj_j2k_merge_ppt() on corrupted images (#939) - - Fixes issue on id:000020,sig:06,src:001958,op:flip4,pos:149 that has two - SOT markers for the same tile with the same tile part number, causing - opj_j2k_merge_ppt() to be called several times. - ...