diff --git a/abi-check/abi_dump/openjpeg/current/ef225/ABI.dump b/abi-check/abi_dump/openjpeg/current/ef225/ABI.dump
index 1339fefb..59df950e 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'
},
- '169182' => {
+ '169316' => {
'Header' => 'openjpeg.h',
'Line' => '1062',
'Return' => '156',
@@ -215,13 +215,13 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '160'
},
- '169502' => {
+ '169636' => {
'Header' => 'openjpeg.h',
'Line' => '1587',
'Param' => {
'0' => {
'name' => 'cstr_info',
- 'type' => '169520'
+ 'type' => '169654'
}
},
'Reg' => {
@@ -232,12 +232,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '966'
},
- '231829' => {
+ '231963' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'p_callback',
@@ -258,12 +258,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '44'
},
- '231927' => {
+ '232061' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'p_callback',
@@ -284,12 +284,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '59'
},
- '232013' => {
+ '232147' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'p_callback',
@@ -310,23 +310,23 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '74'
},
- '232128' => {
+ '232262' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_format',
- 'type' => '220887'
+ 'type' => '221021'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '231915',
+ 'Return' => '232049',
'ShortName' => 'opj_create_decompress',
'Source' => 'openjpeg.c',
'SourceLine' => '168'
},
- '232350' => {
+ '232484' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -342,12 +342,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '364'
},
- '232481' => {
+ '232615' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'num_threads',
@@ -363,12 +363,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '387'
},
- '232599' => {
+ '232733' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'parameters',
@@ -384,7 +384,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '398'
},
- '232741' => {
+ '232875' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -393,7 +393,7 @@ $VAR1 = {
},
'1' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'2' => {
'name' => 'p_image',
@@ -410,12 +410,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '418'
},
- '232944' => {
+ '233078' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'numcomps',
@@ -441,12 +441,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '442'
},
- '233186' => {
+ '233320' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'p_stream',
@@ -467,12 +467,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '471'
},
- '233340' => {
+ '233474' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'p_image',
@@ -508,12 +508,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '492'
},
- '233548' => {
+ '233682' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'p_stream',
@@ -569,12 +569,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '515'
},
- '233766' => {
+ '233900' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'p_tile_index',
@@ -605,12 +605,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '546'
},
- '233966' => {
+ '234100' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'p_stream',
@@ -636,12 +636,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '572'
},
- '234143' => {
+ '234277' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'res_factor',
@@ -657,23 +657,23 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '596'
},
- '234252' => {
+ '234386' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_format',
- 'type' => '220887'
+ 'type' => '221021'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '231915',
+ 'Return' => '232049',
'ShortName' => 'opj_create_compress',
'Source' => 'openjpeg.c',
'SourceLine' => '614'
},
- '234477' => {
+ '234611' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -689,12 +689,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '712'
},
- '234608' => {
+ '234742' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'parameters',
@@ -715,12 +715,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '773'
},
- '234746' => {
+ '234880' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'p_image',
@@ -741,12 +741,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '791'
},
- '234900' => {
+ '235034' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_info',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'p_stream',
@@ -762,12 +762,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '810'
},
- '235031' => {
+ '235165' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'p_stream',
@@ -783,12 +783,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '827'
},
- '235162' => {
+ '235296' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'p_stream',
@@ -804,7 +804,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '844'
},
- '235293' => {
+ '235427' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -835,12 +835,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '864'
},
- '235639' => {
+ '235773' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'p_tile_index',
@@ -871,12 +871,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '894'
},
- '235839' => {
+ '235973' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
}
},
'Reg' => {
@@ -887,12 +887,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '921'
},
- '235940' => {
+ '236074' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
},
'1' => {
'name' => 'info_flag',
@@ -913,12 +913,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '939'
},
- '236077' => {
+ '236211' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
}
},
'Reg' => {
@@ -929,12 +929,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '955'
},
- '236241' => {
+ '236375' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '231915'
+ 'type' => '232049'
}
},
'Reg' => {
@@ -945,12 +945,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '983'
},
- '236326' => {
+ '236460' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_cstr_index',
- 'type' => '236386'
+ 'type' => '236520'
}
},
'Reg' => {
@@ -961,7 +961,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '994'
},
- '236392' => {
+ '236526' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -987,7 +987,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '1009'
},
- '236511' => {
+ '236645' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -1418,7 +1418,7 @@ $VAR1 = {
'Size' => '1',
'Type' => 'Const'
},
- '169520' => {
+ '169654' => {
'BaseType' => '76921',
'Name' => 'opj_codestream_info_v2_t**',
'Size' => '8',
@@ -1911,7 +1911,7 @@ $VAR1 = {
'Size' => '8',
'Type' => 'Pointer'
},
- '220837' => {
+ '220971' => {
'Header' => 'openjpeg.h',
'Line' => '292',
'Memb' => {
@@ -1944,15 +1944,15 @@ $VAR1 = {
'Size' => '4',
'Type' => 'Enum'
},
- '220887' => {
- 'BaseType' => '220837',
+ '221021' => {
+ 'BaseType' => '220971',
'Header' => 'openjpeg.h',
'Line' => '299',
'Name' => 'OPJ_CODEC_FORMAT',
'Size' => '4',
'Type' => 'Typedef'
},
- '222644' => {
+ '222778' => {
'BaseType' => '130',
'Header' => 'openjpeg.h',
'Line' => '578',
@@ -2125,8 +2125,8 @@ $VAR1 = {
'Size' => '216',
'Type' => 'Struct'
},
- '231915' => {
- 'BaseType' => '222644',
+ '232049' => {
+ 'BaseType' => '222778',
'Name' => 'opj_codec_t*',
'Size' => '8',
'Type' => 'Pointer'
@@ -2143,7 +2143,7 @@ $VAR1 = {
'Size' => '4',
'Type' => 'Const'
},
- '236386' => {
+ '236520' => {
'BaseType' => '74699',
'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 4ae76485..6bb368bb 100644
--- a/abi-check/changelog/openjpeg/current/log.html
+++ b/abi-check/changelog/openjpeg/current/log.html
@@ -20,7 +20,61 @@
commit 5dd75f62e20efff9f094fd1dbd0d4d00e8b37689 +commit 4f447c6e18444a4182f7844d25033861eee8df55 +Merge: 5dd75f6 a94cfbd +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2019-04-25 15:32:22 +0200 + + Merge pull request #1192 from rouault/poc_fixes + + compression: emit POC marker when only one single POC is requested (f… + +commit a94cfbd5334922ca5b63cfac9d2e5e0ec98155be +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2019-04-25 14:07:46 +0200 + + Change opj_j2k_check_poc_val() to take into account tile number + +commit bdec5ae2723369be5abba7aaae398aa4ae3225cc +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2019-04-25 01:29:38 +0200 + + Add test for previous commit + +commit 6423163141412cb93364de4e33d90bcffefa0885 +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2019-04-25 01:27:02 +0200 + + Fix POC in multi-tile scenarios: avoid almost endless loop when a tile has no POC settings + +commit b86717fdd36b628ea7ecb5c24f7a086bf5bcd3a7 +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2019-04-25 00:40:04 +0200 + + Add test for previous commit + +commit 23883458b9de2c57fc1890b42efbd0832c8fbe3b +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2019-04-25 00:34:44 +0200 + + opj_j2k_check_poc_val(): prevent potential write outside of allocated array + +commit 6589c609f6d6b3743715fceefbdac6e4ecb76aee +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2019-04-25 00:28:05 +0200 + + opj_j2k_check_poc_val(): fix starting index for checking layer dimension + + The standard mandates that the layer index always starts at zero for every + progression. + +commit 1e3a57563defb6aa7cf24ffd2394d4a820e13bda +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2019-04-25 00:17:13 +0200 + + compression: emit POC marker when only one single POC is requested (fixes #1191) + +commit 5dd75f62e20efff9f094fd1dbd0d4d00e8b37689 Author: Even Rouault <even.rouault@spatialys.com> Date: 2019-04-23 16:52:21 +0200 @@ -823,65 +877,6 @@ Date: 2017-11-30 15:39:45 +0100 Add known failure for i386 target (refs #1043) -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 - - Fix typo in comments - -commit 370d024d108ffe2d5ce9b52f6b7fae5261c4871d -Merge: d9f8f7b 157a3d8 -Author: Even Rouault <even.rouault@mines-paris.org> -Date: 2017-11-14 12:28:44 +0100 - - Merge pull request #1042 from radarhere/cmake - - Changed cmake version test to allow for cmake 2.8.11.x - -commit 157a3d840884abe5020b1a8b94576a7447063385 -Author: Andrew Murray <radarhere@users.noreply.github.com> -Date: 2017-11-14 21:45:09 +1100 - - Changed cmake version test to allow for cmake 2.8.11.x - -commit d9f8f7ba9a51732eda9017cea6493cc86a62c7ef -Merge: 53d2655 10d22ec -Author: Even Rouault <even.rouault@mines-paris.org> -Date: 2017-10-20 21:59:14 +0200 - - Merge pull request #1037 from gfiumara/master - - Add missing fclose() statement in error condition. - -commit 10d22ec26d864e93ad92b4570f044258c6c5bdf9 -Author: Gregory Fiumara <gregory.fiumara@nist.gov> -Date: 2017-10-20 15:31:45 -0400 - - Add missing fclose() statement in error condition. - -commit 53d265576ae0cea480f22f3b08f1c05c8af40d4d -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-10-14 22:42:12 +0200 - - CMakeLists.txt: turn BUILD_PKGCONFIG_FILES ON by default on Windows if compiler is GCC - -commit be6ea90e13fe81a922d831b589c54554282e5545 -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-10-12 01:16:23 +0200 - - opj_j2k_set_threads(): add sanity check to error out if called after opj_read_header() - ...