diff --git a/abi-check/abi_dump/openjpeg/current/3344f/ABI.dump b/abi-check/abi_dump/openjpeg/current/3344f/ABI.dump
index 39cf62ac..b05a71ef 100644
--- a/abi-check/abi_dump/openjpeg/current/3344f/ABI.dump
+++ b/abi-check/abi_dump/openjpeg/current/3344f/ABI.dump
@@ -207,7 +207,7 @@ $VAR1 = {
'Source' => 'cio.c',
'SourceLine' => '271'
},
- '183303' => {
+ '183613' => {
'Header' => 'openjpeg.h',
'Line' => '1096',
'Return' => '156',
@@ -215,13 +215,13 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '171'
},
- '183623' => {
+ '183933' => {
'Header' => 'openjpeg.h',
- 'Line' => '1647',
+ 'Line' => '1650',
'Param' => {
'0' => {
'name' => 'cstr_info',
- 'type' => '183641'
+ 'type' => '183951'
}
},
'Reg' => {
@@ -232,12 +232,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '1014'
},
- '247321' => {
+ '247683' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'p_callback',
@@ -258,12 +258,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '44'
},
- '247419' => {
+ '247781' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'p_callback',
@@ -284,12 +284,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '59'
},
- '247505' => {
+ '247867' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'p_callback',
@@ -310,28 +310,28 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '74'
},
- '247620' => {
+ '247982' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_format',
- 'type' => '236171'
+ 'type' => '236507'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '247407',
+ 'Return' => '247769',
'ShortName' => 'opj_create_decompress',
'Source' => 'openjpeg.c',
'SourceLine' => '179'
},
- '247842' => {
+ '248204' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'parameters',
- 'type' => '85788'
+ 'type' => '85814'
}
},
'Reg' => {
@@ -342,12 +342,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '375'
},
- '247973' => {
+ '248335' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'num_threads',
@@ -363,16 +363,16 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '398'
},
- '248091' => {
+ '248453' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'parameters',
- 'type' => '85788'
+ 'type' => '85814'
}
},
'Reg' => {
@@ -384,7 +384,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '409'
},
- '248233' => {
+ '248595' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -393,11 +393,11 @@ $VAR1 = {
},
'1' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'2' => {
'name' => 'p_image',
- 'type' => '85782'
+ 'type' => '85808'
}
},
'Reg' => {
@@ -410,12 +410,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '429'
},
- '248436' => {
+ '248798' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'numcomps',
@@ -423,7 +423,7 @@ $VAR1 = {
},
'2' => {
'name' => 'comps_indices',
- 'type' => '85800'
+ 'type' => '85826'
},
'3' => {
'name' => 'apply_color_transforms',
@@ -441,12 +441,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '453'
},
- '248678' => {
+ '249040' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'p_stream',
@@ -467,12 +467,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '482'
},
- '248832' => {
+ '249194' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'p_image',
@@ -508,12 +508,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '503'
},
- '249040' => {
+ '249402' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'p_stream',
@@ -569,12 +569,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '526'
},
- '249355' => {
+ '249717' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'p_tile_index',
@@ -605,12 +605,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '557'
},
- '249555' => {
+ '249917' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'p_stream',
@@ -636,12 +636,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '583'
},
- '249732' => {
+ '250094' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'res_factor',
@@ -657,28 +657,28 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '607'
},
- '249841' => {
+ '250203' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_format',
- 'type' => '236171'
+ 'type' => '236507'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '247407',
+ 'Return' => '247769',
'ShortName' => 'opj_create_compress',
'Source' => 'openjpeg.c',
'SourceLine' => '625'
},
- '250066' => {
+ '250428' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'parameters',
- 'type' => '85811'
+ 'type' => '85837'
}
},
'Reg' => {
@@ -689,16 +689,16 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '739'
},
- '250197' => {
+ '250559' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'parameters',
- 'type' => '85811'
+ 'type' => '85837'
},
'2' => {
'name' => 'p_image',
@@ -715,16 +715,16 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '800'
},
- '250335' => {
+ '250697' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'options',
- 'type' => '85817'
+ 'type' => '85843'
}
},
'Reg' => {
@@ -736,12 +736,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '820'
},
- '250450' => {
+ '250812' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'p_image',
@@ -762,12 +762,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '839'
},
- '250604' => {
+ '250966' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_info',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'p_stream',
@@ -783,12 +783,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '858'
},
- '250735' => {
+ '251097' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'p_stream',
@@ -804,12 +804,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '875'
},
- '250866' => {
+ '251228' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'p_stream',
@@ -825,12 +825,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '892'
},
- '250997' => {
+ '251359' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'parameters',
- 'type' => '85811'
+ 'type' => '85837'
},
'1' => {
'name' => 'pEncodingMatrix',
@@ -856,12 +856,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '912'
},
- '251343' => {
+ '251705' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'p_tile_index',
@@ -892,12 +892,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '942'
},
- '251543' => {
+ '251905' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
}
},
'Reg' => {
@@ -908,12 +908,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '969'
},
- '251644' => {
+ '252006' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
},
'1' => {
'name' => 'info_flag',
@@ -921,7 +921,7 @@ $VAR1 = {
},
'2' => {
'name' => 'output_stream',
- 'type' => '85828'
+ 'type' => '85854'
}
},
'Reg' => {
@@ -934,44 +934,44 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '987'
},
- '251781' => {
+ '252143' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '85834',
+ 'Return' => '85860',
'ShortName' => 'opj_get_cstr_info',
'Source' => 'openjpeg.c',
'SourceLine' => '1003'
},
- '251945' => {
+ '252307' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '247407'
+ 'type' => '247769'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '83536',
+ 'Return' => '83562',
'ShortName' => 'opj_get_cstr_index',
'Source' => 'openjpeg.c',
'SourceLine' => '1031'
},
- '252030' => {
+ '252392' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_cstr_index',
- 'type' => '252090'
+ 'type' => '252452'
}
},
'Reg' => {
@@ -982,7 +982,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '1042'
},
- '252096' => {
+ '252458' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -1008,7 +1008,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '1057'
},
- '252529' => {
+ '252891' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -1497,12 +1497,6 @@ $VAR1 = {
'Size' => '4',
'Type' => 'Enum'
},
- '183641' => {
- 'BaseType' => '85834',
- 'Name' => 'opj_codestream_info_v2_t**',
- 'Size' => '8',
- 'Type' => 'Pointer'
- },
'18388' => {
'BaseType' => '18338',
'Header' => 'openjpeg.h',
@@ -1511,6 +1505,12 @@ $VAR1 = {
'Size' => '4',
'Type' => 'Typedef'
},
+ '183951' => {
+ 'BaseType' => '85860',
+ 'Name' => 'opj_codestream_info_v2_t**',
+ 'Size' => '8',
+ 'Type' => 'Pointer'
+ },
'18400' => {
'Header' => 'openjpeg.h',
'Line' => '309',
@@ -2110,7 +2110,7 @@ $VAR1 = {
'Size' => '4',
'Type' => 'Const'
},
- '236121' => {
+ '236457' => {
'Header' => 'openjpeg.h',
'Line' => '322',
'Memb' => {
@@ -2143,15 +2143,15 @@ $VAR1 = {
'Size' => '4',
'Type' => 'Enum'
},
- '236171' => {
- 'BaseType' => '236121',
+ '236507' => {
+ 'BaseType' => '236457',
'Header' => 'openjpeg.h',
'Line' => '329',
'Name' => 'OPJ_CODEC_FORMAT',
'Size' => '4',
'Type' => 'Typedef'
},
- '237928' => {
+ '238264' => {
'BaseType' => '130',
'Header' => 'openjpeg.h',
'Line' => '612',
@@ -2159,14 +2159,14 @@ $VAR1 = {
'Size' => '8',
'Type' => 'Typedef'
},
- '247407' => {
- 'BaseType' => '237928',
+ '247769' => {
+ 'BaseType' => '238264',
'Name' => 'opj_codec_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '252090' => {
- 'BaseType' => '83536',
+ '252452' => {
+ 'BaseType' => '83562',
'Name' => 'opj_codestream_index_t**',
'Size' => '8',
'Type' => 'Pointer'
@@ -3330,55 +3330,55 @@ $VAR1 = {
'Size' => '56',
'Type' => 'Typedef'
},
- '83536' => {
+ '83562' => {
'BaseType' => '80561',
'Name' => 'opj_codestream_index_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '85782' => {
+ '85808' => {
'BaseType' => '21106',
'Name' => 'opj_image_t**',
'Size' => '8',
'Type' => 'Pointer'
},
- '85788' => {
+ '85814' => {
'BaseType' => '78362',
'Name' => 'opj_dparameters_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '85800' => {
+ '85826' => {
'BaseType' => '23240',
'Name' => 'OPJ_UINT32 const*',
'Size' => '8',
'Type' => 'Pointer'
},
- '85811' => {
+ '85837' => {
'BaseType' => '78100',
'Name' => 'opj_cparameters_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '85817' => {
- 'BaseType' => '85823',
+ '85843' => {
+ 'BaseType' => '85849',
'Name' => 'char const*const*',
'Size' => '8',
'Type' => 'Pointer'
},
- '85823' => {
+ '85849' => {
'BaseType' => '156',
'Name' => 'char const*const',
'Size' => '8',
'Type' => 'Const'
},
- '85828' => {
+ '85854' => {
'BaseType' => '75668',
'Name' => 'FILE*',
'Size' => '8',
'Type' => 'Pointer'
},
- '85834' => {
+ '85860' => {
'BaseType' => '80198',
'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 7e4331db..3549daa3 100644
--- a/abi-check/changelog/openjpeg/current/log.html
+++ b/abi-check/changelog/openjpeg/current/log.html
@@ -20,7 +20,28 @@
commit 2624908517ac0489ff1b5471f423dfe84d79da08 +commit c28965f255c711a7b2f84a08b1398e5a0f807b0e +Merge: 2624908 a36ae03 +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2021-06-08 11:11:04 +0200 + + Merge pull request #1359 from rouault/TLM + + Add support for enabling generation of TLM markers in encoder + +commit a36ae0386066c9ddd089788930be5a42a176446e +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2021-06-07 15:16:53 +0200 + + Add support for enabling generation of TLM markers in encoder + + Support was already there, but restricted to Cinema and IMF profiles, + and 255 tiles + + * Add -TLM switch added to opj_compress + * Make opj_encoder_set_extra_options() function accept a TLM=YES option. + +commit 2624908517ac0489ff1b5471f423dfe84d79da08 Merge: e7d908d b5ec98f Author: Even Rouault <even.rouault@spatialys.com> Date: 2021-06-07 15:48:42 +0200 @@ -748,22 +769,6 @@ Date: 2020-05-20 19:24:09 +0200 Irreversible decoding: partially revert previous commit, to fix failures in test suite -commit 3cd1305596f191a01afdc11f9355f9c6590065dd -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2020-05-20 18:00:45 +0200 - - Irreversible compression/decompression DWT: use 1/K constant as per standard - - The previous constant opj_c13318 was mysteriously equal to 2/K , and in - the DWT, we had to divide K and opj_c13318 by 2... The issue was that the - band->stepsize computation in tcd.c didn't take into account the log2gain of - the band. - - The effect of this change is expected to be mostly equivalent to the previous - situation, except some difference in rounding. But it leads to a dramatic - reduction of the mean square error and peak error in the irreversible encoding - of issue141.tif ! - commit 1d358f25c8eabbc7c274bcc148f4f5d594ec13fe Merge: 64689d0 4edb8c8 Author: Even Rouault <even.rouault@spatialys.com> @@ -852,25 +857,38 @@ Date: 2020-04-17 00:37:33 +0200 color_apply_icc_profile: add checks on the number of components (#1236) -commit 040e142288e90c9c2d46d25d0a27f828f968bb93 -Author: Eduardo Barretto <edusbarretto@gmail.com> -Date: 2020-04-16 19:09:40 -0300 - - jp3d/jpwl/mj2/jpip: Fix resource leaks (#1226) - - This issues were found by cppcheck and coverity. - commit 271a71ef0f1dd4740c9f4474279c7da8d15850c9 Author: Even Rouault <even.rouault@spatialys.com> Date: 2020-04-16 20:52:44 +0200 Fix warnings about signed/unsigned casts in pi.c -commit 221a801a97a3ea968a311f7905c18a1eb7f034c4 -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2020-04-16 20:33:22 +0200 +commit f3ee448815eb992b8d4746e32c05e8289f30415f +Author: Sebastian Rasmussen <sebras@gmail.com> +Date: 2018-10-31 15:56:11 +0100 - Rename mis-named function opj_tcd_get_encoded_tile_size() to opj_tcd_get_encoder_input_buffer_size() + openjp2/j2k: Validate all SGcod/SPcod/SPcoc parameter values. + + Previously the multiple component transformation SGcod(C) + and wavelet transformation SPcod(H)/SPcoc(E) parameter + values were never checked, allowing for out of range values. + + The lack of validation allowed the bit stream provided in + issue #1158 through. After this commit an error message + points to the marker segments' parameters as being out of + range. + + input/nonregression/edf_c2_20.jp2 contains an SPcod(H) value + of 17, but according to Table A-20 of the specification only + values 0 and 1 are valid. input/nonregression/issue826.jp2 + contains a SGcod(B) value of 2, but according to Table A-17 + of the specification only values 0 and 1 are valid. + input/nonregression/oss-fuzz2785.jp2 contains a SGcod(B) + value of 32, but it is likewise limited to 0 or 1. These test + cases have been updated to consistently fail to parse the + headers since they contain out of bounds values. + + This fixes issue #1210. ...
- Headers diff: 2.4.0 vs currentThis html diff was produced by rfcdiff 1.41.The latest version is available from http://tools.ietf.org/tools/rfcdiff/
+Headers diff: 2.4.0 vs current+
This html diff was produced by rfcdiff 1.41.The latest version is available from http://tools.ietf.org/tools/rfcdiff/
|