diff --git a/abi-check/abi_dump/openjpeg/current/2c999/ABI.dump b/abi-check/abi_dump/openjpeg/current/2c999/ABI.dump index e3d31b5a..cf59515c 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' }, - '151294' => { + '151957' => { 'Header' => 'openjpeg.h', 'Line' => '1058', 'Return' => '177', @@ -215,13 +215,13 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '160' }, - '151579' => { + '152260' => { 'Header' => 'openjpeg.h', - 'Line' => '1515', + 'Line' => '1536', 'Param' => { '0' => { 'name' => 'cstr_info', - 'type' => '151597' + 'type' => '152278' } }, 'Reg' => { @@ -232,12 +232,12 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '924' }, - '212803' => { + '213572' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' }, '1' => { 'name' => 'p_callback', @@ -258,12 +258,12 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '44' }, - '212901' => { + '213670' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' }, '1' => { 'name' => 'p_callback', @@ -284,12 +284,12 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '59' }, - '212987' => { + '213756' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' }, '1' => { 'name' => 'p_callback', @@ -310,28 +310,28 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '74' }, - '213102' => { + '213871' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_format', - 'type' => '202288' + 'type' => '203033' } }, 'Reg' => { '0' => 'rdi' }, - 'Return' => '212889', + 'Return' => '213658', 'ShortName' => 'opj_create_decompress', 'Source' => 'openjpeg.c', 'SourceLine' => '168' }, - '213324' => { + '214093' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'parameters', - 'type' => '60597' + 'type' => '60828' } }, 'Reg' => { @@ -342,12 +342,12 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '352' }, - '213455' => { + '214224' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' }, '1' => { 'name' => 'num_threads', @@ -363,16 +363,16 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '375' }, - '213573' => { + '214342' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' }, '1' => { 'name' => 'parameters', - 'type' => '60597' + 'type' => '60828' } }, 'Reg' => { @@ -384,7 +384,7 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '386' }, - '213715' => { + '214484' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { @@ -393,11 +393,11 @@ $VAR1 = { }, '1' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' }, '2' => { 'name' => 'p_image', - 'type' => '60585' + 'type' => '60816' } }, 'Reg' => { @@ -410,12 +410,12 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '406' }, - '213918' => { + '214687' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' }, '1' => { 'name' => 'p_stream', @@ -423,7 +423,7 @@ $VAR1 = { }, '2' => { 'name' => 'p_image', - 'type' => '44984' + 'type' => '45008' } }, 'Reg' => { @@ -436,16 +436,16 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '429' }, - '214072' => { + '214841' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' }, '1' => { 'name' => 'p_image', - 'type' => '44984' + 'type' => '45008' }, '2' => { 'name' => 'p_start_x', @@ -477,12 +477,12 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '450' }, - '214280' => { + '215049' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' }, '1' => { 'name' => 'p_stream', @@ -519,7 +519,7 @@ $VAR1 = { }, '9' => { 'name' => 'p_should_go_on', - 'type' => '60591' + 'type' => '60822' } }, 'Reg' => { @@ -538,12 +538,12 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '473' }, - '214498' => { + '215267' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' }, '1' => { 'name' => 'p_tile_index', @@ -574,12 +574,12 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '504' }, - '214698' => { + '215467' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' }, '1' => { 'name' => 'p_stream', @@ -587,7 +587,7 @@ $VAR1 = { }, '2' => { 'name' => 'p_image', - 'type' => '44984' + 'type' => '45008' }, '3' => { 'name' => 'tile_index', @@ -605,12 +605,12 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '530' }, - '214875' => { + '215644' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' }, '1' => { 'name' => 'res_factor', @@ -626,28 +626,28 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '554' }, - '214984' => { + '215753' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_format', - 'type' => '202288' + 'type' => '203033' } }, 'Reg' => { '0' => 'rdi' }, - 'Return' => '212889', + 'Return' => '213658', 'ShortName' => 'opj_create_compress', 'Source' => 'openjpeg.c', 'SourceLine' => '572' }, - '215209' => { + '215978' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'parameters', - 'type' => '60609' + 'type' => '60840' } }, 'Reg' => { @@ -658,20 +658,20 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '670' }, - '215340' => { + '216109' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' }, '1' => { 'name' => 'parameters', - 'type' => '60609' + 'type' => '60840' }, '2' => { 'name' => 'p_image', - 'type' => '44984' + 'type' => '45008' } }, 'Reg' => { @@ -684,16 +684,16 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '731' }, - '215478' => { + '216247' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' }, '1' => { 'name' => 'p_image', - 'type' => '44984' + 'type' => '45008' }, '2' => { 'name' => 'p_stream', @@ -710,12 +710,12 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '749' }, - '215632' => { + '216401' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_info', - 'type' => '212889' + 'type' => '213658' }, '1' => { 'name' => 'p_stream', @@ -731,12 +731,12 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '768' }, - '215763' => { + '216532' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' }, '1' => { 'name' => 'p_stream', @@ -752,12 +752,12 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '785' }, - '215894' => { + '216663' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' }, '1' => { 'name' => 'p_stream', @@ -773,12 +773,12 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '802' }, - '216025' => { + '216794' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'parameters', - 'type' => '60609' + 'type' => '60840' }, '1' => { 'name' => 'pEncodingMatrix', @@ -804,12 +804,12 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '822' }, - '216371' => { + '217140' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' }, '1' => { 'name' => 'p_tile_index', @@ -840,12 +840,12 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '852' }, - '216571' => { + '217340' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' } }, 'Reg' => { @@ -856,12 +856,12 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '879' }, - '216672' => { + '217441' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' }, '1' => { 'name' => 'info_flag', @@ -869,7 +869,7 @@ $VAR1 = { }, '2' => { 'name' => 'output_stream', - 'type' => '60615' + 'type' => '60846' } }, 'Reg' => { @@ -882,44 +882,44 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '897' }, - '216809' => { + '217578' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' } }, 'Reg' => { '0' => 'rdi' }, - 'Return' => '60621', + 'Return' => '60852', 'ShortName' => 'opj_get_cstr_info', 'Source' => 'openjpeg.c', 'SourceLine' => '913' }, - '216973' => { + '217742' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_codec', - 'type' => '212889' + 'type' => '213658' } }, 'Reg' => { '0' => 'rdi' }, - 'Return' => '58649', + 'Return' => '58856', 'ShortName' => 'opj_get_cstr_index', 'Source' => 'openjpeg.c', 'SourceLine' => '941' }, - '217058' => { + '217827' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'p_cstr_index', - 'type' => '217118' + 'type' => '217887' } }, 'Reg' => { @@ -930,7 +930,7 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '952' }, - '217124' => { + '217893' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { @@ -956,7 +956,7 @@ $VAR1 = { 'Source' => 'openjpeg.c', 'SourceLine' => '967' }, - '217243' => { + '218012' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { @@ -991,12 +991,12 @@ $VAR1 = { 'Source' => 'thread.c', 'SourceLine' => '297' }, - '45263' => { + '45337' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { 'name' => 'image', - 'type' => '44984' + 'type' => '45008' } }, 'Reg' => { @@ -1005,9 +1005,9 @@ $VAR1 = { 'Return' => '1', 'ShortName' => 'opj_image_destroy', 'Source' => 'image.c', - 'SourceLine' => '90' + 'SourceLine' => '92' }, - '45441' => { + '45515' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { @@ -1016,11 +1016,11 @@ $VAR1 = { }, '1' => { 'name' => 'cmptparms', - 'type' => '45728' + 'type' => '45866' }, '2' => { 'name' => 'clrspc', - 'type' => '42305' + 'type' => '42329' } }, 'Reg' => { @@ -1028,12 +1028,12 @@ $VAR1 = { '1' => 'rsi', '2' => 'rdx' }, - 'Return' => '44984', + 'Return' => '45008', 'ShortName' => 'opj_image_create', 'Source' => 'image.c', 'SourceLine' => '40' }, - '47450' => { + '47588' => { 'Header' => 'openjpeg.h', 'Param' => { '0' => { @@ -1042,11 +1042,11 @@ $VAR1 = { }, '1' => { 'name' => 'cmptparms', - 'type' => '45728' + 'type' => '45866' }, '2' => { 'name' => 'clrspc', - 'type' => '42305' + 'type' => '42329' } }, 'Reg' => { @@ -1054,10 +1054,44 @@ $VAR1 = { '1' => 'rsi', '2' => 'rdx' }, - 'Return' => '44984', + 'Return' => '45008', 'ShortName' => 'opj_image_tile_create', 'Source' => 'image.c', - 'SourceLine' => '226' + 'SourceLine' => '228' + }, + '47867' => { + 'Header' => 'openjpeg.h', + 'Line' => '1115', + 'Param' => { + '0' => { + 'name' => 'ptr', + 'type' => '141' + } + }, + 'Reg' => { + '0' => 'rdi' + }, + 'Return' => '1', + 'ShortName' => 'opj_image_data_free', + 'Source' => 'openjpeg.c', + 'SourceLine' => '1019' + }, + '47931' => { + 'Header' => 'openjpeg.h', + 'Line' => '1105', + 'Param' => { + '0' => { + 'name' => 'size', + 'type' => '9026' + } + }, + 'Reg' => { + '0' => 'rdi' + }, + 'Return' => '141', + 'ShortName' => 'opj_image_data_alloc', + 'Source' => 'openjpeg.c', + 'SourceLine' => '1012' } }, 'SymbolVersion' => { @@ -1088,6 +1122,8 @@ $VAR1 = { 'opj_get_num_cpus' => 1, 'opj_has_thread_support' => 1, 'opj_image_create' => 1, + 'opj_image_data_alloc' => 1, + 'opj_image_data_free' => 1, 'opj_image_destroy' => 1, 'opj_image_tile_create' => 1, 'opj_read_header' => 1, @@ -1335,8 +1371,8 @@ $VAR1 = { 'Size' => '1', 'Type' => 'Intrinsic' }, - '151597' => { - 'BaseType' => '60621', + '152278' => { + 'BaseType' => '60852', 'Name' => 'opj_codestream_info_v2_t**', 'Size' => '8', 'Type' => 'Pointer' @@ -1530,7 +1566,7 @@ $VAR1 = { 'Size' => '216', 'Type' => 'Struct' }, - '202238' => { + '202983' => { 'Header' => 'openjpeg.h', 'Line' => '292', 'Memb' => { @@ -1563,15 +1599,15 @@ $VAR1 = { 'Size' => '4', 'Type' => 'Enum' }, - '202288' => { - 'BaseType' => '202238', + '203033' => { + 'BaseType' => '202983', 'Header' => 'openjpeg.h', 'Line' => '299', 'Name' => 'OPJ_CODEC_FORMAT', 'Size' => '4', 'Type' => 'Typedef' }, - '204045' => { + '204790' => { 'BaseType' => '141', 'Header' => 'openjpeg.h', 'Line' => '574', @@ -1579,19 +1615,19 @@ $VAR1 = { 'Size' => '8', 'Type' => 'Typedef' }, - '212889' => { - 'BaseType' => '204045', + '213658' => { + 'BaseType' => '204790', 'Name' => 'opj_codec_t*', 'Size' => '8', 'Type' => 'Pointer' }, - '217118' => { - 'BaseType' => '58649', + '217887' => { + 'BaseType' => '58856', 'Name' => 'opj_codestream_index_t**', 'Size' => '8', 'Type' => 'Pointer' }, - '42044' => { + '42068' => { 'BaseType' => '149', 'Header' => 'openjpeg.h', 'Line' => '114', @@ -1599,7 +1635,7 @@ $VAR1 = { 'Size' => '1', 'Type' => 'Typedef' }, - '42099' => { + '42123' => { 'BaseType' => '70', 'Header' => 'stdint.h', 'Line' => '50', @@ -1607,15 +1643,15 @@ $VAR1 = { 'Size' => '2', 'Type' => 'Typedef' }, - '42132' => { - 'BaseType' => '42099', + '42156' => { + 'BaseType' => '42123', 'Header' => 'openjpeg.h', 'Line' => '124', 'Name' => 'OPJ_UINT16', 'Size' => '2', 'Type' => 'Typedef' }, - '42187' => { + '42211' => { 'Header' => 'openjpeg.h', 'Line' => '267', 'Memb' => { @@ -1648,15 +1684,15 @@ $VAR1 = { 'Size' => '4', 'Type' => 'Enum' }, - '42237' => { - 'BaseType' => '42187', + '42261' => { + 'BaseType' => '42211', 'Header' => 'openjpeg.h', 'Line' => '274', 'Name' => 'OPJ_PROG_ORDER', 'Size' => '4', 'Type' => 'Typedef' }, - '42249' => { + '42273' => { 'Header' => 'openjpeg.h', 'Line' => '279', 'Memb' => { @@ -1693,15 +1729,15 @@ $VAR1 = { 'Size' => '4', 'Type' => 'Enum' }, - '42305' => { - 'BaseType' => '42249', + '42329' => { + 'BaseType' => '42273', 'Header' => 'openjpeg.h', 'Line' => '287', 'Name' => 'OPJ_COLOR_SPACE', 'Size' => '4', 'Type' => 'Typedef' }, - '42317' => { + '42341' => { 'Header' => 'openjpeg.h', 'Line' => '325', 'Memb' => { @@ -1718,7 +1754,7 @@ $VAR1 = { '10' => { 'name' => 'progorder', 'offset' => '40', - 'type' => '42797' + 'type' => '42821' }, '11' => { 'name' => 'tile', @@ -1878,39 +1914,39 @@ $VAR1 = { '8' => { 'name' => 'prg1', 'offset' => '32', - 'type' => '42237' + 'type' => '42261' }, '9' => { 'name' => 'prg', 'offset' => '36', - 'type' => '42237' + 'type' => '42261' } }, 'Name' => 'struct opj_poc', 'Size' => '148', 'Type' => 'Struct' }, - '42797' => { - 'BaseType' => '42044', + '42821' => { + 'BaseType' => '42068', 'Name' => 'OPJ_CHAR[5]', 'Size' => '5', 'Type' => 'Array' }, - '42813' => { - 'BaseType' => '42317', + '42837' => { + 'BaseType' => '42341', 'Header' => 'openjpeg.h', 'Line' => '348', 'Name' => 'opj_poc_t', 'Size' => '148', 'Type' => 'Typedef' }, - '42825' => { - 'BaseType' => '42813', + '42849' => { + 'BaseType' => '42837', 'Name' => 'opj_poc_t[32]', 'Size' => '4736', 'Type' => 'Array' }, - '42841' => { + '42865' => { 'Header' => 'openjpeg.h', 'Line' => '633', 'Memb' => { @@ -1937,7 +1973,7 @@ $VAR1 = { '12' => { 'name' => 'alpha', 'offset' => '56', - 'type' => '42132' + 'type' => '42156' }, '2' => { 'name' => 'w', @@ -1984,15 +2020,15 @@ $VAR1 = { 'Size' => '64', 'Type' => 'Struct' }, - '43022' => { - 'BaseType' => '42841', + '43046' => { + 'BaseType' => '42865', 'Header' => 'openjpeg.h', 'Line' => '660', 'Name' => 'opj_image_comp_t', 'Size' => '64', 'Type' => 'Typedef' }, - '43034' => { + '43058' => { 'Header' => 'openjpeg.h', 'Line' => '665', 'Memb' => { @@ -2024,12 +2060,12 @@ $VAR1 = { '5' => { 'name' => 'color_space', 'offset' => '20', - 'type' => '42305' + 'type' => '42329' }, '6' => { 'name' => 'comps', 'offset' => '24', - 'type' => '43161' + 'type' => '43185' }, '7' => { 'name' => 'icc_profile_buf', @@ -2046,21 +2082,21 @@ $VAR1 = { 'Size' => '48', 'Type' => 'Struct' }, - '43161' => { - 'BaseType' => '43022', + '43185' => { + 'BaseType' => '43046', 'Name' => 'opj_image_comp_t*', 'Size' => '8', 'Type' => 'Pointer' }, - '43173' => { - 'BaseType' => '43034', + '43197' => { + 'BaseType' => '43058', 'Header' => 'openjpeg.h', 'Line' => '684', 'Name' => 'opj_image_t', 'Size' => '48', 'Type' => 'Typedef' }, - '43185' => { + '43209' => { 'Header' => 'openjpeg.h', 'Line' => '690', 'Memb' => { @@ -2114,20 +2150,14 @@ $VAR1 = { 'Size' => '36', 'Type' => 'Struct' }, - '43308' => { - 'BaseType' => '43185', + '43332' => { + 'BaseType' => '43209', 'Header' => 'openjpeg.h', 'Line' => '709', 'Name' => 'opj_image_cmptparm_t', 'Size' => '36', 'Type' => 'Typedef' }, - '44984' => { - 'BaseType' => '43173', - 'Name' => 'opj_image_t*', - 'Size' => '8', - 'Type' => 'Pointer' - }, '45' => { 'BaseType' => '56', 'Header' => 'stddef.h', @@ -2136,13 +2166,19 @@ $VAR1 = { 'Size' => '8', 'Type' => 'Typedef' }, - '45728' => { - 'BaseType' => '43308', + '45008' => { + 'BaseType' => '43197', + 'Name' => 'opj_image_t*', + 'Size' => '8', + 'Type' => 'Pointer' + }, + '45866' => { + 'BaseType' => '43332', 'Name' => 'opj_image_cmptparm_t*', 'Size' => '8', 'Type' => 'Pointer' }, - '50899' => { + '51106' => { 'BaseType' => '188', 'Header' => 'stdio.h', 'Line' => '49', @@ -2150,7 +2186,7 @@ $VAR1 = { 'Size' => '216', 'Type' => 'Typedef' }, - '51616' => { + '51823' => { 'Header' => 'openjpeg.h', 'Line' => '246', 'Memb' => { @@ -2175,15 +2211,15 @@ $VAR1 = { 'Size' => '4', 'Type' => 'Enum' }, - '51655' => { - 'BaseType' => '51616', + '51862' => { + 'BaseType' => '51823', 'Header' => 'openjpeg.h', 'Line' => '251', 'Name' => 'OPJ_RSIZ_CAPABILITIES', 'Size' => '4', 'Type' => 'Typedef' }, - '51666' => { + '51873' => { 'Header' => 'openjpeg.h', 'Line' => '257', 'Memb' => { @@ -2208,15 +2244,15 @@ $VAR1 = { 'Size' => '4', 'Type' => 'Enum' }, - '51704' => { - 'BaseType' => '51666', + '51911' => { + 'BaseType' => '51873', 'Header' => 'openjpeg.h', 'Line' => '262', 'Name' => 'OPJ_CINEMA_MODE', 'Size' => '4', 'Type' => 'Typedef' }, - '52388' => { + '52595' => { 'Header' => 'openjpeg.h', 'Line' => '353', 'Memb' => { @@ -2238,12 +2274,12 @@ $VAR1 = { '11' => { 'name' => 'prog_order', 'offset' => '52', - 'type' => '42237' + 'type' => '42261' }, '12' => { 'name' => 'POC', 'offset' => '56', - 'type' => '42825' + 'type' => '42849' }, '13' => { 'name' => 'numpocs', @@ -2258,12 +2294,12 @@ $VAR1 = { '15' => { 'name' => 'tcp_rates', 'offset' => '4800', - 'type' => '53252' + 'type' => '53459' }, '16' => { 'name' => 'tcp_distoratio', 'offset' => '5200', - 'type' => '53252' + 'type' => '53459' }, '17' => { 'name' => 'numresolution', @@ -2313,22 +2349,22 @@ $VAR1 = { '25' => { 'name' => 'prcw_init', 'offset' => '5632', - 'type' => '53268' + 'type' => '53475' }, '26' => { 'name' => 'prch_init', 'offset' => '5764', - 'type' => '53268' + 'type' => '53475' }, '27' => { 'name' => 'infile', 'offset' => '5896', - 'type' => '53284' + 'type' => '53491' }, '28' => { 'name' => 'outfile', 'offset' => '9992', - 'type' => '53284' + 'type' => '53491' }, '29' => { 'name' => 'index_on', @@ -2343,7 +2379,7 @@ $VAR1 = { '30' => { 'name' => 'index', 'offset' => '14092', - 'type' => '53284' + 'type' => '53491' }, '31' => { 'name' => 'image_offset_x0', @@ -2388,7 +2424,7 @@ $VAR1 = { '39' => { 'name' => 'jpwl_hprot_TPH_tileno', 'offset' => '18220', - 'type' => '53301' + 'type' => '53508' }, '4' => { 'name' => 'cp_tdy', @@ -2398,22 +2434,22 @@ $VAR1 = { '40' => { 'name' => 'jpwl_hprot_TPH', 'offset' => '18284', - 'type' => '53301' + 'type' => '53508' }, '41' => { 'name' => 'jpwl_pprot_tileno', 'offset' => '18348', - 'type' => '53301' + 'type' => '53508' }, '42' => { 'name' => 'jpwl_pprot_packno', 'offset' => '18412', - 'type' => '53301' + 'type' => '53508' }, '43' => { 'name' => 'jpwl_pprot', 'offset' => '18476', - 'type' => '53301' + 'type' => '53508' }, '44' => { 'name' => 'jpwl_sens_size', @@ -2438,12 +2474,12 @@ $VAR1 = { '48' => { 'name' => 'jpwl_sens_TPH_tileno', 'offset' => '18556', - 'type' => '53301' + 'type' => '53508' }, '49' => { 'name' => 'jpwl_sens_TPH', 'offset' => '18620', - 'type' => '53301' + 'type' => '53508' }, '5' => { 'name' => 'cp_disto_alloc', @@ -2453,7 +2489,7 @@ $VAR1 = { '50' => { 'name' => 'cp_cinema', 'offset' => '18684', - 'type' => '51704' + 'type' => '51911' }, '51' => { 'name' => 'max_comp_size', @@ -2463,7 +2499,7 @@ $VAR1 = { '52' => { 'name' => 'cp_rsiz', 'offset' => '18692', - 'type' => '51655' + 'type' => '51862' }, '53' => { 'name' => 'tp_on', @@ -2498,7 +2534,7 @@ $VAR1 = { '59' => { 'name' => 'rsiz', 'offset' => '18716', - 'type' => '42132' + 'type' => '42156' }, '6' => { 'name' => 'cp_fixed_alloc', @@ -2513,7 +2549,7 @@ $VAR1 = { '8' => { 'name' => 'cp_matrice', 'offset' => '32', - 'type' => '53230' + 'type' => '53437' }, '9' => { 'name' => 'cp_comment', @@ -2525,45 +2561,45 @@ $VAR1 = { 'Size' => '18720', 'Type' => 'Struct' }, - '53230' => { + '53437' => { 'BaseType' => '98', 'Name' => 'int*', 'Size' => '8', 'Type' => 'Pointer' }, - '53252' => { + '53459' => { 'BaseType' => '163', 'Name' => 'float[100]', 'Size' => '400', 'Type' => 'Array' }, - '53268' => { + '53475' => { 'BaseType' => '98', 'Name' => 'int[33]', 'Size' => '132', 'Type' => 'Array' }, - '53284' => { + '53491' => { 'BaseType' => '149', 'Name' => 'char[4096]', 'Size' => '4096', 'Type' => 'Array' }, - '53301' => { + '53508' => { 'BaseType' => '98', 'Name' => 'int[16]', 'Size' => '64', 'Type' => 'Array' }, - '53317' => { - 'BaseType' => '52388', + '53524' => { + 'BaseType' => '52595', 'Header' => 'openjpeg.h', 'Line' => '501', 'Name' => 'opj_cparameters_t', 'Size' => '18720', 'Type' => 'Typedef' }, - '53329' => { + '53536' => { 'Header' => 'openjpeg.h', 'Line' => '508', 'Memb' => { @@ -2615,12 +2651,12 @@ $VAR1 = { '2' => { 'name' => 'infile', 'offset' => '8', - 'type' => '53284' + 'type' => '53491' }, '3' => { 'name' => 'outfile', 'offset' => '4104', - 'type' => '53284' + 'type' => '53491' }, '4' => { 'name' => 'decod_format', @@ -2657,15 +2693,15 @@ $VAR1 = { 'Size' => '8252', 'Type' => 'Struct' }, - '53579' => { - 'BaseType' => '53329', + '53786' => { + 'BaseType' => '53536', 'Header' => 'openjpeg.h', 'Line' => '568', 'Name' => 'opj_dparameters_t', 'Size' => '8252', 'Type' => 'Typedef' }, - '54095' => { + '54302' => { 'Header' => 'openjpeg.h', 'Line' => '722', 'Memb' => { @@ -2694,15 +2730,15 @@ $VAR1 = { 'Size' => '32', 'Type' => 'Struct' }, - '54161' => { - 'BaseType' => '54095', + '54368' => { + 'BaseType' => '54302', 'Header' => 'openjpeg.h', 'Line' => '731', 'Name' => 'opj_packet_info_t', 'Size' => '32', 'Type' => 'Typedef' }, - '54173' => { + '54380' => { 'Header' => 'openjpeg.h', 'Line' => '738', 'Memb' => { @@ -2726,27 +2762,27 @@ $VAR1 = { 'Size' => '24', 'Type' => 'Struct' }, - '54226' => { - 'BaseType' => '54173', + '54433' => { + 'BaseType' => '54380', 'Header' => 'openjpeg.h', 'Line' => '745', 'Name' => 'opj_marker_info_t', 'Size' => '24', 'Type' => 'Typedef' }, - '54578' => { - 'BaseType' => '54161', + '54785' => { + 'BaseType' => '54368', 'Name' => 'opj_packet_info_t*', 'Size' => '8', 'Type' => 'Pointer' }, - '54584' => { - 'BaseType' => '54226', + '54791' => { + 'BaseType' => '54433', 'Name' => 'opj_marker_info_t*', 'Size' => '8', 'Type' => 'Pointer' }, - '54924' => { + '55131' => { 'Header' => 'openjpeg.h', 'Line' => '862', 'Memb' => { @@ -2813,33 +2849,33 @@ $VAR1 = { '8' => { 'name' => 'stepsizes_mant', 'offset' => '32', - 'type' => '55126' + 'type' => '55333' }, '9' => { 'name' => 'stepsizes_expn', 'offset' => '420', - 'type' => '55126' + 'type' => '55333' } }, 'Name' => 'struct opj_tccp_info', 'Size' => '1080', 'Type' => 'Struct' }, - '55126' => { + '55333' => { 'BaseType' => '9015', 'Name' => 'OPJ_UINT32[97]', 'Size' => '388', 'Type' => 'Array' }, - '55158' => { - 'BaseType' => '54924', + '55365' => { + 'BaseType' => '55131', 'Header' => 'openjpeg.h', 'Line' => '892', 'Name' => 'opj_tccp_info_t', 'Size' => '1080', 'Type' => 'Typedef' }, - '55170' => { + '55377' => { 'Header' => 'openjpeg.h', 'Line' => '897', 'Memb' => { @@ -2856,7 +2892,7 @@ $VAR1 = { '2' => { 'name' => 'prg', 'offset' => '8', - 'type' => '42237' + 'type' => '42261' }, '3' => { 'name' => 'numlayers', @@ -2871,28 +2907,28 @@ $VAR1 = { '5' => { 'name' => 'tccp_info', 'offset' => '24', - 'type' => '55262' + 'type' => '55469' } }, 'Name' => 'struct opj_tile_v2_info', 'Size' => '32', 'Type' => 'Struct' }, - '55262' => { - 'BaseType' => '55158', + '55469' => { + 'BaseType' => '55365', 'Name' => 'opj_tccp_info_t*', 'Size' => '8', 'Type' => 'Pointer' }, - '55268' => { - 'BaseType' => '55170', + '55475' => { + 'BaseType' => '55377', 'Header' => 'openjpeg.h', 'Line' => '913', 'Name' => 'opj_tile_info_v2_t', 'Size' => '32', 'Type' => 'Typedef' }, - '55280' => { + '55487' => { 'Header' => 'openjpeg.h', 'Line' => '918', 'Memb' => { @@ -2934,33 +2970,33 @@ $VAR1 = { '7' => { 'name' => 'm_default_tile_info', 'offset' => '32', - 'type' => '55268' + 'type' => '55475' }, '8' => { 'name' => 'tile_info', 'offset' => '64', - 'type' => '55409' + 'type' => '55616' } }, 'Name' => 'struct opj_codestream_info_v2', 'Size' => '72', 'Type' => 'Struct' }, - '55409' => { - 'BaseType' => '55268', + '55616' => { + 'BaseType' => '55475', 'Name' => 'opj_tile_info_v2_t*', 'Size' => '8', 'Type' => 'Pointer' }, - '55415' => { - 'BaseType' => '55280', + '55622' => { + 'BaseType' => '55487', 'Header' => 'openjpeg.h', 'Line' => '942', 'Name' => 'opj_codestream_info_v2_t', 'Size' => '72', 'Type' => 'Typedef' }, - '55427' => { + '55634' => { 'Header' => 'openjpeg.h', 'Line' => '948', 'Memb' => { @@ -2984,15 +3020,15 @@ $VAR1 = { 'Size' => '24', 'Type' => 'Struct' }, - '55480' => { - 'BaseType' => '55427', + '55687' => { + 'BaseType' => '55634', 'Header' => 'openjpeg.h', 'Line' => '956', 'Name' => 'opj_tp_index_t', 'Size' => '24', 'Type' => 'Typedef' }, - '55492' => { + '55699' => { 'Header' => 'openjpeg.h', 'Line' => '961', 'Memb' => { @@ -3019,7 +3055,7 @@ $VAR1 = { '4' => { 'name' => 'tp_index', 'offset' => '16', - 'type' => '55636' + 'type' => '55843' }, '5' => { 'name' => 'marknum', @@ -3029,7 +3065,7 @@ $VAR1 = { '6' => { 'name' => 'marker', 'offset' => '32', - 'type' => '54584' + 'type' => '54791' }, '7' => { 'name' => 'maxmarknum', @@ -3044,28 +3080,28 @@ $VAR1 = { '9' => { 'name' => 'packet_index', 'offset' => '48', - 'type' => '54578' + 'type' => '54785' } }, 'Name' => 'struct opj_tile_index', 'Size' => '56', 'Type' => 'Struct' }, - '55636' => { - 'BaseType' => '55480', + '55843' => { + 'BaseType' => '55687', 'Name' => 'opj_tp_index_t*', 'Size' => '8', 'Type' => 'Pointer' }, - '55642' => { - 'BaseType' => '55492', + '55849' => { + 'BaseType' => '55699', 'Header' => 'openjpeg.h', 'Line' => '988', 'Name' => 'opj_tile_index_t', 'Size' => '56', 'Type' => 'Typedef' }, - '55654' => { + '55861' => { 'Header' => 'openjpeg.h', 'Line' => '993', 'Memb' => { @@ -3092,7 +3128,7 @@ $VAR1 = { '4' => { 'name' => 'marker', 'offset' => '32', - 'type' => '54584' + 'type' => '54791' }, '5' => { 'name' => 'maxmarknum', @@ -3107,21 +3143,21 @@ $VAR1 = { '7' => { 'name' => 'tile_index', 'offset' => '48', - 'type' => '55772' + 'type' => '55979' } }, 'Name' => 'struct opj_codestream_index', 'Size' => '56', 'Type' => 'Struct' }, - '55772' => { - 'BaseType' => '55642', + '55979' => { + 'BaseType' => '55849', 'Name' => 'opj_tile_index_t*', 'Size' => '8', 'Type' => 'Pointer' }, - '55778' => { - 'BaseType' => '55654', + '55985' => { + 'BaseType' => '55861', 'Header' => 'openjpeg.h', 'Line' => '1016', 'Name' => 'opj_codestream_index_t', @@ -3133,8 +3169,8 @@ $VAR1 = { 'Size' => '8', 'Type' => 'Intrinsic' }, - '58649' => { - 'BaseType' => '55778', + '58856' => { + 'BaseType' => '55985', 'Name' => 'opj_codestream_index_t*', 'Size' => '8', 'Type' => 'Pointer' @@ -3170,38 +3206,38 @@ $VAR1 = { 'Size' => '24', 'Type' => 'Struct' }, - '60585' => { - 'BaseType' => '44984', + '60816' => { + 'BaseType' => '45008', 'Name' => 'opj_image_t**', 'Size' => '8', 'Type' => 'Pointer' }, - '60591' => { + '60822' => { 'BaseType' => '701', 'Name' => 'OPJ_BOOL*', 'Size' => '8', 'Type' => 'Pointer' }, - '60597' => { - 'BaseType' => '53579', + '60828' => { + 'BaseType' => '53786', 'Name' => 'opj_dparameters_t*', 'Size' => '8', 'Type' => 'Pointer' }, - '60609' => { - 'BaseType' => '53317', + '60840' => { + 'BaseType' => '53524', 'Name' => 'opj_cparameters_t*', 'Size' => '8', 'Type' => 'Pointer' }, - '60615' => { - 'BaseType' => '50899', + '60846' => { + 'BaseType' => '51106', 'Name' => 'FILE*', 'Size' => '8', 'Type' => 'Pointer' }, - '60621' => { - 'BaseType' => '55415', + '60852' => { + 'BaseType' => '55622', 'Name' => 'opj_codestream_info_v2_t*', 'Size' => '8', 'Type' => 'Pointer' diff --git a/abi-check/abi_dump/openjpeg/current/2c999/meta.json b/abi-check/abi_dump/openjpeg/current/2c999/meta.json index 4b673e7b..c640a624 100644 --- a/abi-check/abi_dump/openjpeg/current/2c999/meta.json +++ b/abi-check/abi_dump/openjpeg/current/2c999/meta.json @@ -1,7 +1,7 @@ { "Object": "lib/libopenjp2.so.2.2.0", "Lang": "C", - "TotalSymbols": "46", + "TotalSymbols": "48", "PublicABI": "1", "Version": "1.7" } \ No newline at end of file diff --git a/abi-check/changelog/openjpeg/current/log.html b/abi-check/changelog/openjpeg/current/log.html index bac0fb61..d59d2c74 100644 --- a/abi-check/changelog/openjpeg/current/log.html +++ b/abi-check/changelog/openjpeg/current/log.html @@ -20,7 +20,204 @@

Changelog from Git



-
commit 2fbd4bb0b9c6178f12c852dc40db6ab05734bfe2
+
commit 3b1b0672663b59853b63d48f94b63ca497883527
+Merge: 2fbd4bb 9211469
+Author: Even Rouault <even.rouault@mines-paris.org>
+Date:   2017-08-07 20:17:36 +0200
+
+    Merge pull request #968 from rouault/reduce_memory_decoding
+    
+    Reduce memory decoding
+
+commit 92114694a48638e86c07e4adf11b78878045c8a9
+Author: Even Rouault <even.rouault@spatialys.com>
+Date:   2017-07-06 19:34:21 +0200
+
+    Slight improvement in management of code block chunks
+    
+    Instead of having the chunk array at the segment level, we can move it down to
+    the codeblock itself since segments are filled in sequential order.
+    Limit the number of memory allocation, and decrease slightly the memory usage.
+    
+    On MAPA_005.jp2
+    
+    n4: 1871312549 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+     n1: 1610689344 0x4E781E7: opj_aligned_malloc (opj_malloc.c:61)
+      n1: 1610689344 0x4E71D1B: opj_alloc_tile_component_data (tcd.c:676)
+       n1: 1610689344 0x4E726CF: opj_tcd_init_decode_tile (tcd.c:816)
+        n1: 1610689344 0x4E4BE39: opj_j2k_read_tile_header (j2k.c:8617)
+         n1: 1610689344 0x4E4C902: opj_j2k_decode_tiles (j2k.c:10348)
+          n1: 1610689344 0x4E4E3CE: opj_j2k_decode (j2k.c:7846)
+           n1: 1610689344 0x4E53002: opj_jp2_decode (jp2.c:1564)
+            n0: 1610689344 0x40374E: main (opj_decompress.c:1459)
+     n1: 219232541 0x4E4BC50: opj_j2k_read_tile_header (j2k.c:4683)
+      n1: 219232541 0x4E4C902: opj_j2k_decode_tiles (j2k.c:10348)
+       n1: 219232541 0x4E4E3CE: opj_j2k_decode (j2k.c:7846)
+        n1: 219232541 0x4E53002: opj_jp2_decode (jp2.c:1564)
+         n0: 219232541 0x40374E: main (opj_decompress.c:1459)
+     n1: 23893200 0x4E72735: opj_tcd_init_decode_tile (tcd.c:1225)
+      n1: 23893200 0x4E4BE39: opj_j2k_read_tile_header (j2k.c:8617)
+       n1: 23893200 0x4E4C902: opj_j2k_decode_tiles (j2k.c:10348)
+        n1: 23893200 0x4E4E3CE: opj_j2k_decode (j2k.c:7846)
+         n1: 23893200 0x4E53002: opj_jp2_decode (jp2.c:1564)
+          n0: 23893200 0x40374E: main (opj_decompress.c:1459)
+     n0: 17497464 in 52 places, all below massif's threshold (1.00%)
+
+commit ca34d13e76a588a00171e57690c1deeaf068723a
+Author: Even Rouault <even.rouault@spatialys.com>
+Date:   2017-07-06 16:11:11 +0200
+
+    Decoding: do not allocate memory for the codestream of each codeblock
+    
+    Currently we allocate at least 8192 bytes for each codeblock, and copy
+    the relevant parts of the codestream in that per-codeblock buffer as we
+    decode packets.
+    As the whole codestream for the tile is ingested in memory and alive
+    during the decoding, we can directly point to it instead of copying. But
+    to do that, we need an intermediate concept, a 'chunk' of code-stream segment,
+    given that segments may be made of data at different places in the code-stream
+    when quality layers are used.
+    
+    With that change, the decoding of MAPA_005.jp2 goes down from the previous
+    improvement of 2.7 GB down to 1.9 GB.
+    
+    New profile:
+    
+    n4: 1885648469 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+     n1: 1610689344 0x4E78287: opj_aligned_malloc (opj_malloc.c:61)
+      n1: 1610689344 0x4E71D7B: opj_alloc_tile_component_data (tcd.c:676)
+       n1: 1610689344 0x4E7272C: opj_tcd_init_decode_tile (tcd.c:816)
+        n1: 1610689344 0x4E4BDD9: opj_j2k_read_tile_header (j2k.c:8618)
+         n1: 1610689344 0x4E4C8A2: opj_j2k_decode_tiles (j2k.c:10349)
+          n1: 1610689344 0x4E4E36E: opj_j2k_decode (j2k.c:7847)
+           n1: 1610689344 0x4E52FA2: opj_jp2_decode (jp2.c:1564)
+            n0: 1610689344 0x40374E: main (opj_decompress.c:1459)
+     n1: 219232541 0x4E4BBF0: opj_j2k_read_tile_header (j2k.c:4685)
+      n1: 219232541 0x4E4C8A2: opj_j2k_decode_tiles (j2k.c:10349)
+       n1: 219232541 0x4E4E36E: opj_j2k_decode (j2k.c:7847)
+        n1: 219232541 0x4E52FA2: opj_jp2_decode (jp2.c:1564)
+         n0: 219232541 0x40374E: main (opj_decompress.c:1459)
+     n1: 39822000 0x4E727A9: opj_tcd_init_decode_tile (tcd.c:1219)
+      n1: 39822000 0x4E4BDD9: opj_j2k_read_tile_header (j2k.c:8618)
+       n1: 39822000 0x4E4C8A2: opj_j2k_decode_tiles (j2k.c:10349)
+        n1: 39822000 0x4E4E36E: opj_j2k_decode (j2k.c:7847)
+         n1: 39822000 0x4E52FA2: opj_jp2_decode (jp2.c:1564)
+          n0: 39822000 0x40374E: main (opj_decompress.c:1459)
+     n0: 15904584 in 52 places, all below massif's threshold (1.00%)
+
+commit 373520db309430b68dd9ff09cba03a25f711a88e
+Author: Even Rouault <even.rouault@spatialys.com>
+Date:   2017-07-06 13:23:29 +0200
+
+    Add documentation for magic values in the code
+
+commit 434ace4ff74cc3eee401d4d3c02668c1d85f2a0d
+Author: Even Rouault <even.rouault@spatialys.com>
+Date:   2017-07-06 02:17:26 +0200
+
+    opj_jp2_apply_pclr() also needs to use opj_image_data_alloc/opj_image_data_free
+
+commit 0c1fc0593ef5b918068709fd74d76e4824c90e7c
+Author: Even Rouault <even.rouault@spatialys.com>
+Date:   2017-07-06 02:02:25 +0200
+
+    Complementary fix to previous commit
+
+commit f58aab9d6a57e48bdc60e15dd373c24de74719a9
+Author: Even Rouault <even.rouault@spatialys.com>
+Date:   2017-07-06 01:47:40 +0200
+
+    Add opj_image_data_alloc() / opj_image_data_free()
+    
+    As bin/common/color.c used to directly call malloc()/free(), we need
+    to export functions dedicated to allocating/freeing image component data.
+
+commit 61fb5dd7f81c2e3dfabbb99f59dc89572d59fa37
+Author: Even Rouault <even.rouault@spatialys.com>
+Date:   2017-07-06 01:05:24 +0200
+
+    Fix crash on Windows due to b7594c0fcb9dd3aa6356d72c4a525d76168da689
+    
+    b7594c0fcb9dd3aa6356d72c4a525d76168da689 may put opj_tcd_tilecomp_t->data
+    allocated by opj_alloc_tile_component_data() as the image->comps[].data. As
+    opj_alloc_tile_component_data() use opj_aligned_malloc() we must be sure to
+    ue opj_alined_malloc()/_free() in all places where we alloc/free
+    image->comps[].data.
+    
+    Note: this might have some compatibility impact in case user code does itself
+    the allocation/free of image->comps[].data
+
+commit 793edc38e41700e9b4cda4b7f9c79aba95b8d989
+Author: Even Rouault <even.rouault@spatialys.com>
+Date:   2017-07-05 23:48:28 +0200
+
+    Decrease memory consumption for whole image single tile decoding.
+    
+    We can use the same buffer for the tile decoding and the final image, and
+    save the intermediate buffer to transfer between those.
+    
+    Effect on the decoding of MAPA (9944 x 13498 x 3 components of size byte)
+    
+    Peak memory from 4.5 GB to 2.7 GB
+    
+    Now:
+    n5: 2699708767 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+     n1: 1610689344 0x4E77E07: opj_aligned_malloc (opj_malloc.c:61) <-- final image
+      n1: 1610689344 0x4E7195B: opj_alloc_tile_component_data (tcd.c:676)
+       n1: 1610689344 0x4E722D2: opj_tcd_init_decode_tile (tcd.c:816)
+        n1: 1610689344 0x4E4BCF1: opj_j2k_read_tile_header (j2k.c:8597)
+         n1: 1610689344 0x4E4C742: opj_j2k_decode_tiles (j2k.c:10324)
+          n1: 1610689344 0x4E4E20E: opj_j2k_decode (j2k.c:7826)
+           n1: 1610689344 0x4E52E42: opj_jp2_decode (jp2.c:1564)
+            n0: 1610689344 0x40369E: main (opj_decompress.c:1459)
+     n1: 815554560 0x4E72231: opj_tcd_init_decode_tile (tcd.c:1217) <-- working memory for code blocks: 9944*13498/64/64*8192*3
+      n1: 815554560 0x4E4BCF1: opj_j2k_read_tile_header (j2k.c:8597)
+       n1: 815554560 0x4E4C742: opj_j2k_decode_tiles (j2k.c:10324)
+        n1: 815554560 0x4E4E20E: opj_j2k_decode (j2k.c:7826)
+         n1: 815554560 0x4E52E42: opj_jp2_decode (jp2.c:1564)
+          n0: 815554560 0x40369E: main (opj_decompress.c:1459)
+     n1: 219758391 0x4E4C0BF: opj_j2k_read_tile_header (j2k.c:4661) <-- ingestion of code stream
+      n1: 219758391 0x4E4C742: opj_j2k_decode_tiles (j2k.c:10324)
+       n1: 219758391 0x4E4E20E: opj_j2k_decode (j2k.c:7826)
+        n1: 219758391 0x4E52E42: opj_jp2_decode (jp2.c:1564)
+         n0: 219758391 0x40369E: main (opj_decompress.c:1459)
+     n1: 39822000 0x4E7224F: opj_tcd_init_decode_tile (tcd.c:1224) <-- OPJ_J2K_DEFAULT_NB_SEGS*sizeof(opj_tcd_seg_t) per codeblock
+      n1: 39822000 0x4E4BCF1: opj_j2k_read_tile_header (j2k.c:8597)
+       n1: 39822000 0x4E4C742: opj_j2k_decode_tiles (j2k.c:10324)
+        n1: 39822000 0x4E4E20E: opj_j2k_decode (j2k.c:7826)
+         n1: 39822000 0x4E52E42: opj_jp2_decode (jp2.c:1564)
+          n0: 39822000 0x40369E: main (opj_decompress.c:1459)
+     n0: 13884472 in 49 places, all below massif's threshold (1.00%)
+    
+    Before:
+    n5: 4493329848 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+     n2: 1610709160 0x4E77C87: opj_aligned_malloc (opj_malloc.c:61)
+      n1: 1610689344 0x4E717DB: opj_alloc_tile_component_data (tcd.c:676)
+       n1: 1610689344 0x4E72152: opj_tcd_init_decode_tile (tcd.c:816)
+        n1: 1610689344 0x4E4BCF1: opj_j2k_read_tile_header (j2k.c:8597)
+         n1: 1610689344 0x4E4C64A: opj_j2k_decode_tiles (j2k.c:10318)
+          n1: 1610689344 0x4E4E08E: opj_j2k_decode (j2k.c:7826)
+           n1: 1610689344 0x4E52CC2: opj_jp2_decode (jp2.c:1564)
+            n0: 1610689344 0x40369E: main (opj_decompress.c:1459)
+      n0: 19816 in 2 places, all below massif's threshold (1.00%)
+     n1: 1610689344 0x4E43F36: opj_j2k_update_image_data.isra.7 (j2k.c:8743)
+      n1: 1610689344 0x4E4C5C1: opj_j2k_decode_tiles (j2k.c:10358)
+       n1: 1610689344 0x4E4E08E: opj_j2k_decode (j2k.c:7826)
+        n1: 1610689344 0x4E52CC2: opj_jp2_decode (jp2.c:1564)
+         n0: 1610689344 0x40369E: main (opj_decompress.c:1459)
+     n1: 815554560 0x4E720B1: opj_tcd_init_decode_tile (tcd.c:1217)
+      n1: 815554560 0x4E4BCF1: opj_j2k_read_tile_header (j2k.c:8597)
+       n1: 815554560 0x4E4C64A: opj_j2k_decode_tiles (j2k.c:10318)
+        n1: 815554560 0x4E4E08E: opj_j2k_decode (j2k.c:7826)
+         n1: 815554560 0x4E52CC2: opj_jp2_decode (jp2.c:1564)
+          n0: 815554560 0x40369E: main (opj_decompress.c:1459)
+     n1: 402672336 0x4E4C545: opj_j2k_decode_tiles (j2k.c:10336)
+      n1: 402672336 0x4E4E08E: opj_j2k_decode (j2k.c:7826)
+       n1: 402672336 0x4E52CC2: opj_jp2_decode (jp2.c:1564)
+        n0: 402672336 0x40369E: main (opj_decompress.c:1459)
+     n0: 53704448 in 58 places, all below massif's threshold (1.00%)
+
+commit 2fbd4bb0b9c6178f12c852dc40db6ab05734bfe2
 Author: Even Rouault <even.rouault@spatialys.com>
 Date:   2017-08-04 18:01:29 +0200
 
@@ -374,12 +571,6 @@ Date:   2017-07-06 12:11:37 +0200
 
     Comment fix
 
-commit a38c4496b631bb5d3f8d5ea42d394544523a9bc6
-Author: Even Rouault <even.rouault@spatialys.com>
-Date:   2017-07-05 21:33:42 +0200
-
-    Remove unused m_DA_x0, m_DA_y0, m_DA_x1, m_DA_y1 members from opj_j2k_dec structure
-
 ...
diff --git a/abi-check/compat_report/openjpeg/2.1.2/current/58361/abi_compat_report.html b/abi-check/compat_report/openjpeg/2.1.2/current/58361/abi_compat_report.html index 5675efaf..19b9c8af 100644 --- a/abi-check/compat_report/openjpeg/2.1.2/current/58361/abi_compat_report.html +++ b/abi-check/compat_report/openjpeg/2.1.2/current/58361/abi_compat_report.html @@ -1,4 +1,4 @@ - + @@ -287,7 +287,7 @@ function showContent(header, id)

Problem Summary


- +
SeverityCount
Added Symbols-3
@@ -298,11 +298,13 @@ function showContent(header, id)
SeverityCount
Added Symbols-5
Removed SymbolsHigh0
Problems with
Data Types
High0
Medium0
Problems with
Constants
Low0
-

Added Symbols  3 


+

Added Symbols  5 


openjpeg.h, libopenjp2.so.2.2.0
opj_codec_set_threads ( opj_codec_t* p_codec, int num_threads )
opj_get_num_cpus ( )
opj_has_thread_support ( )
+opj_image_data_alloc OPJ_SIZE_T size )
+opj_image_data_free void* ptr )

to the top

Header Files  1 


diff --git a/abi-check/compat_report/openjpeg/2.1.2/current/58361/meta.json b/abi-check/compat_report/openjpeg/2.1.2/current/58361/meta.json index 3ae3defc..8aced4db 100644 --- a/abi-check/compat_report/openjpeg/2.1.2/current/58361/meta.json +++ b/abi-check/compat_report/openjpeg/2.1.2/current/58361/meta.json @@ -1,6 +1,6 @@ { "Affected": "0", - "Added": 3, + "Added": 5, "Removed": 0, "TotalProblems": 0, "Object1": "lib/libopenjp2.so.2.1.2", diff --git a/abi-check/compat_reports/openjpeg/2.1.2_to_current/abi_compat_report.html b/abi-check/compat_reports/openjpeg/2.1.2_to_current/abi_compat_report.html index 8fbfa4c2..44a34787 100644 --- a/abi-check/compat_reports/openjpeg/2.1.2_to_current/abi_compat_report.html +++ b/abi-check/compat_reports/openjpeg/2.1.2_to_current/abi_compat_report.html @@ -1,4 +1,4 @@ - + @@ -287,7 +287,7 @@ function showContent(header, id)

Problem Summary


- +
SeverityCount
Added Symbols-3
@@ -298,11 +298,13 @@ function showContent(header, id)
SeverityCount
Added Symbols-5
Removed SymbolsHigh0
Problems with
Data Types
High0
Medium0
Problems with
Constants
Low0
-

Added Symbols  3 


+

Added Symbols  5 


openjpeg.h, libopenjp2.so.2.2.0
opj_codec_set_threads ( opj_codec_t* p_codec, int num_threads )
opj_get_num_cpus ( )
opj_has_thread_support ( )
+opj_image_data_alloc OPJ_SIZE_T size )
+opj_image_data_free void* ptr )

to the top

Header Files  1 


diff --git a/abi-check/compat_reports/openjpeg/2.1.2_to_current/src_compat_report.html b/abi-check/compat_reports/openjpeg/2.1.2_to_current/src_compat_report.html index e3fe35d7..9fb3e12e 100644 --- a/abi-check/compat_reports/openjpeg/2.1.2_to_current/src_compat_report.html +++ b/abi-check/compat_reports/openjpeg/2.1.2_to_current/src_compat_report.html @@ -1,4 +1,4 @@ - + @@ -287,7 +287,7 @@ function showContent(header, id)

Problem Summary


- +
SeverityCount
Added Symbols-3
@@ -298,11 +298,13 @@ function showContent(header, id)
SeverityCount
Added Symbols-5
Removed SymbolsHigh0
Problems with
Data Types
High0
Medium0
Problems with
Constants
Low0
-

Added Symbols  3 


+

Added Symbols  5 


openjpeg.h
opj_codec_set_threads ( opj_codec_t* p_codec, int num_threads )
opj_get_num_cpus ( )
opj_has_thread_support ( )
+opj_image_data_alloc OPJ_SIZE_T size )
+opj_image_data_free void* ptr )

to the top

Header Files  1 


diff --git a/abi-check/db/openjpeg/Tracker.data b/abi-check/db/openjpeg/Tracker.data index 15d0402b..bd69f16f 100644 --- a/abi-check/db/openjpeg/Tracker.data +++ b/abi-check/db/openjpeg/Tracker.data @@ -115,7 +115,7 @@ $VAR1 = { 'Lang' => 'C', 'Object' => 'lib/libopenjp2.so.2.2.0', 'Path' => 'abi_dump/openjpeg/current/2c999/ABI.dump', - 'TotalSymbols' => '46', + 'TotalSymbols' => '48', 'Version' => '1.7' } } @@ -287,7 +287,7 @@ $VAR1 = { }, '2.1.2' => { 'current' => { - 'Added' => 3, + 'Added' => 5, 'BC' => 100, 'ChangedSoname' => 0, 'ObjectsAdded' => 0, @@ -455,7 +455,7 @@ $VAR1 = { '2.1.2' => { 'current' => { '58361' => { - 'Added' => 3, + 'Added' => 5, 'Affected' => 0, 'Object1' => 'lib/libopenjp2.so.2.1.2', 'Object2' => 'lib/libopenjp2.so.2.2.0', @@ -496,7 +496,7 @@ $VAR1 = { '2.1' => '2014-04-29 12:58', '2.1.1' => '2016-07-05 14:54', '2.1.2' => '2016-09-28 18:18', - 'current' => '2017-08-04 18:01:29' + 'current' => '2017-08-07 20:17:36' }, 'HeadersDiff' => { '1.1' => { @@ -574,7 +574,7 @@ $VAR1 = { 'Maintainer' => 'OpenJPEG team', 'MaintainerUrl' => 'http://www.openjpeg.org/', 'PackageDiff' => {}, - 'ScmUpdateTime' => '1501863199', + 'ScmUpdateTime' => '1502130566', 'Soname' => { '1.1' => { 'lib/libopenjpeg.so' => 'libopenjpeg.so' diff --git a/abi-check/headers_diff/openjpeg/2.1.2/current/diff.html b/abi-check/headers_diff/openjpeg/2.1.2/current/diff.html index 98cff163..b3b1576a 100644 --- a/abi-check/headers_diff/openjpeg/2.1.2/current/diff.html +++ b/abi-check/headers_diff/openjpeg/2.1.2/current/diff.html @@ -1248,6 +1248,27 @@ w version of the library). OPJ_API opj_image_t* OPJ_CALLCONV opj_image_tile_create(OPJ_UINT32 numcmpts OPJ_API opj_image_t* OPJ_CALLCONV opj_image_tile_create(OPJ_UINT32 numcmpts , opj_image_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc); , opj_image_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc); + + /** + * Allocator for opj_image_t->comps[].data + * To be paired with opj_image_data_free. + * + * @param size number of bytes to allocate + * + * @return a new pointer if successful, NULL otherwise. + * @since 2.2.0 + */ + OPJ_API void* OPJ_CALLCONV opj_image_data_alloc(OPJ_SIZE_T size); + + /** + * Destructor for opj_image_t->comps[].data + * To be paired with opj_image_data_alloc. + * + * @param ptr Pointer to free + * + * @since 2.2.0 + */ + OPJ_API void OPJ_CALLCONV opj_image_data_free(void* ptr); /* /* ========================================================== ========================================================== @@ -1780,7 +1801,7 @@ at); <li>Size of precinct : 2^15 x 2^15 (means 1 precinct) <li>Size of precinct : 2^15 x 2^15 (means 1 precinct) <li>Size of code-block : 64 x 64 <li>Size of code-block : 64 x 64 - skipping to change at line 1417 skipping to change at line 1454 + skipping to change at line 1417 skipping to change at line 1475 <li>No mode switch activated <li>No mode switch activated <li>Progression order: LRCP <li>Progression order: LRCP <li>No index file <li>No index file @@ -1994,7 +2015,7 @@ c);  End of changes. 158 change blocks.  - 949 lines changed or deleted 929 lines changed or added + 949 lines changed or deleted 950 lines changed or added

diff --git a/abi-check/installed/openjpeg/current/include/openjpeg-2.2/openjpeg.h b/abi-check/installed/openjpeg/current/include/openjpeg-2.2/openjpeg.h index 0aea383b..5fbf7ac3 100644 --- a/abi-check/installed/openjpeg/current/include/openjpeg-2.2/openjpeg.h +++ b/abi-check/installed/openjpeg/current/include/openjpeg-2.2/openjpeg.h @@ -1093,6 +1093,27 @@ OPJ_API void OPJ_CALLCONV opj_image_destroy(opj_image_t *image); OPJ_API opj_image_t* OPJ_CALLCONV opj_image_tile_create(OPJ_UINT32 numcmpts, opj_image_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc); +/** + * Allocator for opj_image_t->comps[].data + * To be paired with opj_image_data_free. + * + * @param size number of bytes to allocate + * + * @return a new pointer if successful, NULL otherwise. + * @since 2.2.0 +*/ +OPJ_API void* OPJ_CALLCONV opj_image_data_alloc(OPJ_SIZE_T size); + +/** + * Destructor for opj_image_t->comps[].data + * To be paired with opj_image_data_alloc. + * + * @param ptr Pointer to free + * + * @since 2.2.0 +*/ +OPJ_API void OPJ_CALLCONV opj_image_data_free(void* ptr); + /* ========================================================== stream functions definitions diff --git a/abi-check/installed/openjpeg/current/lib/libopenjp2.a b/abi-check/installed/openjpeg/current/lib/libopenjp2.a index 680ec473..9547a6cc 100644 Binary files a/abi-check/installed/openjpeg/current/lib/libopenjp2.a and b/abi-check/installed/openjpeg/current/lib/libopenjp2.a differ diff --git a/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.2.0 b/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.2.0 index a2a11815..70785515 100644 Binary files a/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.2.0 and b/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.2.0 differ diff --git a/abi-check/objects_report/openjpeg/2.1.2/current/meta.json b/abi-check/objects_report/openjpeg/2.1.2/current/meta.json index 5baffa6f..3b5e4750 100644 --- a/abi-check/objects_report/openjpeg/2.1.2/current/meta.json +++ b/abi-check/objects_report/openjpeg/2.1.2/current/meta.json @@ -1,6 +1,6 @@ { "BC": "100", - "Added": 3, + "Added": 5, "Removed": 0, "TotalProblems": 0, "ObjectsAdded": 0, diff --git a/abi-check/objects_report/openjpeg/2.1.2/current/report.html b/abi-check/objects_report/openjpeg/2.1.2/current/report.html index de2f962a..9fcd7066 100644 --- a/abi-check/objects_report/openjpeg/2.1.2/current/report.html +++ b/abi-check/objects_report/openjpeg/2.1.2/current/report.html @@ -30,7 +30,7 @@ libopenjp2.so.2.1.2 100% -3 new +5 new 0 diff --git a/abi-check/timeline/openjpeg/index.html b/abi-check/timeline/openjpeg/index.html index e46df078..f24c738f 100644 --- a/abi-check/timeline/openjpeg/index.html +++ b/abi-check/timeline/openjpeg/index.html @@ -30,11 +30,11 @@ Headers
Diff current -2017-08-04
18:01 +2017-08-07
20:17 7 changelog 100% -3 new +5 new 0 2 @@ -152,7 +152,7 @@ N/A N/A -
Maintained by OpenJPEG team. Last updated on Fri Aug 4 16:13:45 2017.
+
Maintained by OpenJPEG team. Last updated on Mon Aug 7 18:29:53 2017.


abi-laboratory.pro