diff --git a/abi-check/abi_dump/openjpeg/current/9bc2e/ABI.dump b/abi-check/abi_dump/openjpeg/current/9bc2e/ABI.dump
index 4d109016..7fe71ab2 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'
},
- '169257' => {
+ '169215' => {
'Header' => 'openjpeg.h',
'Line' => '1062',
'Return' => '156',
@@ -215,13 +215,13 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '160'
},
- '169577' => {
+ '169535' => {
'Header' => 'openjpeg.h',
'Line' => '1586',
'Param' => {
'0' => {
'name' => 'cstr_info',
- 'type' => '169595'
+ 'type' => '169553'
}
},
'Reg' => {
@@ -232,12 +232,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '966'
},
- '231966' => {
+ '231924' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'p_callback',
@@ -258,12 +258,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '44'
},
- '232064' => {
+ '232022' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'p_callback',
@@ -284,12 +284,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '59'
},
- '232150' => {
+ '232108' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'p_callback',
@@ -310,23 +310,23 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '74'
},
- '232265' => {
+ '232223' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_format',
- 'type' => '221024'
+ 'type' => '220982'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '232052',
+ 'Return' => '232010',
'ShortName' => 'opj_create_decompress',
'Source' => 'openjpeg.c',
'SourceLine' => '168'
},
- '232487' => {
+ '232445' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -342,12 +342,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '364'
},
- '232618' => {
+ '232576' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'num_threads',
@@ -363,12 +363,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '387'
},
- '232736' => {
+ '232694' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'parameters',
@@ -384,7 +384,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '398'
},
- '232878' => {
+ '232836' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -393,7 +393,7 @@ $VAR1 = {
},
'1' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'2' => {
'name' => 'p_image',
@@ -410,12 +410,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '418'
},
- '233081' => {
+ '233039' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'numcomps',
@@ -441,12 +441,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '442'
},
- '233323' => {
+ '233281' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'p_stream',
@@ -467,12 +467,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '471'
},
- '233477' => {
+ '233435' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'p_image',
@@ -508,12 +508,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '492'
},
- '233685' => {
+ '233643' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'p_stream',
@@ -569,12 +569,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '515'
},
- '233903' => {
+ '233861' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'p_tile_index',
@@ -605,12 +605,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '546'
},
- '234103' => {
+ '234061' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'p_stream',
@@ -636,12 +636,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '572'
},
- '234280' => {
+ '234238' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'res_factor',
@@ -657,23 +657,23 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '596'
},
- '234389' => {
+ '234347' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_format',
- 'type' => '221024'
+ 'type' => '220982'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '232052',
+ 'Return' => '232010',
'ShortName' => 'opj_create_compress',
'Source' => 'openjpeg.c',
'SourceLine' => '614'
},
- '234614' => {
+ '234572' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -689,12 +689,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '712'
},
- '234745' => {
+ '234703' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'parameters',
@@ -715,12 +715,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '773'
},
- '234883' => {
+ '234841' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'p_image',
@@ -741,12 +741,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '791'
},
- '235037' => {
+ '234995' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_info',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'p_stream',
@@ -762,12 +762,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '810'
},
- '235168' => {
+ '235126' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'p_stream',
@@ -783,12 +783,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '827'
},
- '235299' => {
+ '235257' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'p_stream',
@@ -804,7 +804,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '844'
},
- '235430' => {
+ '235388' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -835,12 +835,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '864'
},
- '235776' => {
+ '235734' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'p_tile_index',
@@ -871,12 +871,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '894'
},
- '235976' => {
+ '235934' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
}
},
'Reg' => {
@@ -887,12 +887,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '921'
},
- '236077' => {
+ '236035' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
},
'1' => {
'name' => 'info_flag',
@@ -913,12 +913,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '939'
},
- '236214' => {
+ '236172' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
}
},
'Reg' => {
@@ -929,12 +929,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '955'
},
- '236378' => {
+ '236336' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232052'
+ 'type' => '232010'
}
},
'Reg' => {
@@ -945,12 +945,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '983'
},
- '236463' => {
+ '236421' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_cstr_index',
- 'type' => '236523'
+ 'type' => '236481'
}
},
'Reg' => {
@@ -961,7 +961,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '994'
},
- '236529' => {
+ '236487' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -987,7 +987,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '1009'
},
- '236648' => {
+ '236606' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -1418,7 +1418,7 @@ $VAR1 = {
'Size' => '1',
'Type' => 'Const'
},
- '169595' => {
+ '169553' => {
'BaseType' => '76932',
'Name' => 'opj_codestream_info_v2_t**',
'Size' => '8',
@@ -1911,7 +1911,7 @@ $VAR1 = {
'Size' => '8',
'Type' => 'Pointer'
},
- '220974' => {
+ '220932' => {
'Header' => 'openjpeg.h',
'Line' => '292',
'Memb' => {
@@ -1944,15 +1944,15 @@ $VAR1 = {
'Size' => '4',
'Type' => 'Enum'
},
- '221024' => {
- 'BaseType' => '220974',
+ '220982' => {
+ 'BaseType' => '220932',
'Header' => 'openjpeg.h',
'Line' => '299',
'Name' => 'OPJ_CODEC_FORMAT',
'Size' => '4',
'Type' => 'Typedef'
},
- '222781' => {
+ '222739' => {
'BaseType' => '130',
'Header' => 'openjpeg.h',
'Line' => '578',
@@ -2125,8 +2125,8 @@ $VAR1 = {
'Size' => '216',
'Type' => 'Struct'
},
- '232052' => {
- 'BaseType' => '222781',
+ '232010' => {
+ 'BaseType' => '222739',
'Name' => 'opj_codec_t*',
'Size' => '8',
'Type' => 'Pointer'
@@ -2143,7 +2143,7 @@ $VAR1 = {
'Size' => '4',
'Type' => 'Const'
},
- '236523' => {
+ '236481' => {
'BaseType' => '74710',
'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 19361bc1..69d19046 100644
--- a/abi-check/changelog/openjpeg/current/log.html
+++ b/abi-check/changelog/openjpeg/current/log.html
@@ -20,7 +20,18 @@
commit 936910cf7a4d85e341582746126d105a8a044f30 +commit 98cfdd31340509895f3e2a36f667f66bb3cf1ff2 +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2017-11-30 14:48:34 +0100 + + opj_j2k_read_cod: remove check for 'No more than one COD marker per tile' (fixes #1043) + + This check was added per https://github.com/uclouvain/openjpeg/commit/daed8cc9195555e101ab708a501af2dfe6d5e001 + to fix https://github.com/uclouvain/openjpeg/issues/476 , but it does not seem + to be necessary with latest master (issue476.jp2 doesn't cause memory issues), + and breaks reading legit files. + +commit 936910cf7a4d85e341582746126d105a8a044f30 Author: Even Rouault <even.rouault@spatialys.com> Date: 2017-11-30 14:26:17 +0100 @@ -535,12 +546,6 @@ Date: 2017-09-01 16:30:54 +0200 Optimize opj_dwt_decode_partial_1() when cas == 0 -commit 1644665a9105e2d761e8b29f43af602560e6bcf9 -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-09-01 16:30:52 +0200 - - opj_j2k_update_image_data(): avoid zero-ing the buffer if not needed - commit 6ce49bf5aebb3c45c464fa82d14cfd4bf7026a28 Author: Even Rouault <even.rouault@spatialys.com> Date: 2017-09-01 10:26:18 +0200 @@ -600,12 +605,6 @@ Date: 2017-08-24 14:31:13 +0200 issue104_jpxstream.jp2 decompresses just fine (and like Kakadu). Update md5refs.txt and remove from knownfailures -commit c059f431e6262fe5ce296e8137dd478dfe4d1af1 -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-08-24 14:09:34 +0200 - - Remove broken.jpc test from known failures, by avoiding too long processing time - ...