Update ABI/API compatibility reports after commit b8c4b450c4b5bec649463573f57235c4f41...
[openjpeg.git] / abi-check / abi_dump / openjpeg / current / 2c999 / ABI.dump
index 3ad718b87ebfb84eccdd363d5e2a94ee2c89f0e6..59e2b7c2fed195e647449c83f67ad9283f35f5e6 100644 (file)
@@ -2,7 +2,7 @@ $VAR1 = {
           'ABI_DUMPER_VERSION' => '0.99.15',
           'ABI_DUMP_VERSION' => '3.2',
           'Arch' => 'x86_64',
-          'GccVersion' => '4.8.5',
+          'GccVersion' => '4.8.1',
           'Headers' => {
                          'openjpeg.h' => 1
                        },
@@ -23,49 +23,49 @@ $VAR1 = {
                          'thread.c' => 1
                        },
           'SymbolInfo' => {
-                            '14395' => {
+                            '14399' => {
                                          'Header' => 'openjpeg.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'p_buffer_size',
-                                                               'type' => '9029'
+                                                               'type' => '9026'
                                                              },
                                                       '1' => {
                                                                'name' => 'l_is_input',
-                                                               'type' => '694'
+                                                               'type' => '2747'
                                                              }
                                                     },
                                          'Reg' => {
                                                     '0' => 'rdi',
                                                     '1' => 'rsi'
                                                   },
-                                         'Return' => '14547',
+                                         'Return' => '14551',
                                          'ShortName' => 'opj_stream_create',
                                          'Source' => 'cio.c',
                                          'SourceLine' => '158'
                                        },
-                            '14553' => {
+                            '14557' => {
                                          'Header' => 'openjpeg.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'l_is_input',
-                                                               'type' => '694'
+                                                               'type' => '2747'
                                                              }
                                                     },
                                          'Reg' => {
                                                     '0' => 'rdi'
                                                   },
-                                         'Return' => '14547',
+                                         'Return' => '14551',
                                          'ShortName' => 'opj_stream_default_create',
                                          'Source' => 'cio.c',
                                          'SourceLine' => '194'
                                        },
-                            '14630' => {
+                            '14634' => {
                                          'Header' => 'openjpeg.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'p_stream',
-                                                               'type' => '14547'
+                                                               'type' => '14551'
                                                              }
                                                     },
                                          'Reg' => {
@@ -76,16 +76,16 @@ $VAR1 = {
                                          'Source' => 'cio.c',
                                          'SourceLine' => '199'
                                        },
-                            '14723' => {
+                            '14727' => {
                                          'Header' => 'openjpeg.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'p_stream',
-                                                               'type' => '14547'
+                                                               'type' => '14551'
                                                              },
                                                       '1' => {
                                                                'name' => 'p_function',
-                                                               'type' => '11251'
+                                                               'type' => '11255'
                                                              }
                                                     },
                                          'Reg' => {
@@ -97,16 +97,16 @@ $VAR1 = {
                                          'Source' => 'cio.c',
                                          'SourceLine' => '213'
                                        },
-                            '14792' => {
+                            '14796' => {
                                          'Header' => 'openjpeg.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'p_stream',
-                                                               'type' => '14547'
+                                                               'type' => '14551'
                                                              },
                                                       '1' => {
                                                                'name' => 'p_function',
-                                                               'type' => '11344'
+                                                               'type' => '11348'
                                                              }
                                                     },
                                          'Reg' => {
@@ -118,16 +118,16 @@ $VAR1 = {
                                          'Source' => 'cio.c',
                                          'SourceLine' => '225'
                                        },
-                            '14861' => {
+                            '14865' => {
                                          'Header' => 'openjpeg.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'p_stream',
-                                                               'type' => '14547'
+                                                               'type' => '14551'
                                                              },
                                                       '1' => {
                                                                'name' => 'p_function',
-                                                               'type' => '11294'
+                                                               'type' => '11298'
                                                              }
                                                     },
                                          'Reg' => {
@@ -139,16 +139,16 @@ $VAR1 = {
                                          'Source' => 'cio.c',
                                          'SourceLine' => '236'
                                        },
-                            '14930' => {
+                            '14934' => {
                                          'Header' => 'openjpeg.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'p_stream',
-                                                               'type' => '14547'
+                                                               'type' => '14551'
                                                              },
                                                       '1' => {
                                                                'name' => 'p_function',
-                                                               'type' => '11306'
+                                                               'type' => '11310'
                                                              }
                                                     },
                                          'Reg' => {
@@ -160,20 +160,20 @@ $VAR1 = {
                                          'Source' => 'cio.c',
                                          'SourceLine' => '248'
                                        },
-                            '14999' => {
+                            '15003' => {
                                          'Header' => 'openjpeg.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'p_stream',
-                                                               'type' => '14547'
+                                                               'type' => '14551'
                                                              },
                                                       '1' => {
                                                                'name' => 'p_data',
-                                                               'type' => '141'
+                                                               'type' => '130'
                                                              },
                                                       '2' => {
                                                                'name' => 'p_function',
-                                                               'type' => '11382'
+                                                               'type' => '11386'
                                                              }
                                                     },
                                          'Reg' => {
@@ -186,16 +186,16 @@ $VAR1 = {
                                          'Source' => 'cio.c',
                                          'SourceLine' => '260'
                                        },
-                            '15086' => {
+                            '15090' => {
                                          'Header' => 'openjpeg.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'p_stream',
-                                                               'type' => '14547'
+                                                               'type' => '14551'
                                                              },
                                                       '1' => {
                                                                'name' => 'data_length',
-                                                               'type' => '11184'
+                                                               'type' => '11188'
                                                              }
                                                     },
                                          'Reg' => {
@@ -207,21 +207,21 @@ $VAR1 = {
                                          'Source' => 'cio.c',
                                          'SourceLine' => '271'
                                        },
-                            '151962' => {
+                            '168209' => {
                                           'Header' => 'openjpeg.h',
-                                          'Line' => '1059',
-                                          'Return' => '177',
+                                          'Line' => '1062',
+                                          'Return' => '156',
                                           'ShortName' => 'opj_version',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '160'
                                         },
-                            '152265' => {
+                            '168537' => {
                                           'Header' => 'openjpeg.h',
-                                          'Line' => '1537',
+                                          'Line' => '1550',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'cstr_info',
-                                                                'type' => '152283'
+                                                                'type' => '168555'
                                                               }
                                                      },
                                           'Reg' => {
@@ -232,20 +232,20 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '924'
                                         },
-                            '213867' => {
+                            '230605' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_callback',
-                                                                'type' => '11217'
+                                                                'type' => '11221'
                                                               },
                                                        '2' => {
                                                                 'name' => 'p_user_data',
-                                                                'type' => '141'
+                                                                'type' => '130'
                                                               }
                                                      },
                                           'Reg' => {
@@ -253,25 +253,25 @@ $VAR1 = {
                                                      '1' => 'rsi',
                                                      '2' => 'rdx'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_set_info_handler',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '44'
                                         },
-                            '213965' => {
+                            '230703' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_callback',
-                                                                'type' => '11217'
+                                                                'type' => '11221'
                                                               },
                                                        '2' => {
                                                                 'name' => 'p_user_data',
-                                                                'type' => '141'
+                                                                'type' => '130'
                                                               }
                                                      },
                                           'Reg' => {
@@ -279,25 +279,25 @@ $VAR1 = {
                                                      '1' => 'rsi',
                                                      '2' => 'rdx'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_set_warning_handler',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '59'
                                         },
-                            '214051' => {
+                            '230789' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_callback',
-                                                                'type' => '11217'
+                                                                'type' => '11221'
                                                               },
                                                        '2' => {
                                                                 'name' => 'p_user_data',
-                                                                'type' => '141'
+                                                                'type' => '130'
                                                               }
                                                      },
                                           'Reg' => {
@@ -305,33 +305,33 @@ $VAR1 = {
                                                      '1' => 'rsi',
                                                      '2' => 'rdx'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_set_error_handler',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '74'
                                         },
-                            '214166' => {
+                            '230904' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_format',
-                                                                'type' => '203219'
+                                                                'type' => '219762'
                                                               }
                                                      },
                                           'Reg' => {
                                                      '0' => 'rdi'
                                                    },
-                                          'Return' => '213953',
+                                          'Return' => '230691',
                                           'ShortName' => 'opj_create_decompress',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '168'
                                         },
-                            '214388' => {
+                            '231126' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'parameters',
-                                                                'type' => '60851'
+                                                                'type' => '76838'
                                                               }
                                                      },
                                           'Reg' => {
@@ -342,62 +342,62 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '352'
                                         },
-                            '214519' => {
+                            '231257' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '1' => {
                                                                 'name' => 'num_threads',
-                                                                'type' => '98'
+                                                                'type' => '87'
                                                               }
                                                      },
                                           'Reg' => {
                                                      '0' => 'rdi',
                                                      '1' => 'rsi'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_codec_set_threads',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '375'
                                         },
-                            '214637' => {
+                            '231375' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '1' => {
                                                                 'name' => 'parameters',
-                                                                'type' => '60851'
+                                                                'type' => '76838'
                                                               }
                                                      },
                                           'Reg' => {
                                                      '0' => 'rdi',
                                                      '1' => 'rsi'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_setup_decoder',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '386'
                                         },
-                            '214779' => {
+                            '231517' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_stream',
-                                                                'type' => '14547'
+                                                                'type' => '14551'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '2' => {
                                                                 'name' => 'p_image',
-                                                                'type' => '60839'
+                                                                'type' => '76826'
                                                               }
                                                      },
                                           'Reg' => {
@@ -405,25 +405,25 @@ $VAR1 = {
                                                      '1' => 'rsi',
                                                      '2' => 'rdx'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_read_header',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '406'
                                         },
-                            '214982' => {
+                            '231720' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_stream',
-                                                                'type' => '14547'
+                                                                'type' => '14551'
                                                               },
                                                        '2' => {
                                                                 'name' => 'p_image',
-                                                                'type' => '44971'
+                                                                'type' => '21108'
                                                               }
                                                      },
                                           'Reg' => {
@@ -431,37 +431,37 @@ $VAR1 = {
                                                      '1' => 'rsi',
                                                      '2' => 'rdx'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_decode',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '429'
                                         },
-                            '215136' => {
+                            '231874' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_image',
-                                                                'type' => '44971'
+                                                                'type' => '21108'
                                                               },
                                                        '2' => {
                                                                 'name' => 'p_start_x',
-                                                                'type' => '9007'
+                                                                'type' => '9004'
                                                               },
                                                        '3' => {
                                                                 'name' => 'p_start_y',
-                                                                'type' => '9007'
+                                                                'type' => '9004'
                                                               },
                                                        '4' => {
                                                                 'name' => 'p_end_x',
-                                                                'type' => '9007'
+                                                                'type' => '9004'
                                                               },
                                                        '5' => {
                                                                 'name' => 'p_end_y',
-                                                                'type' => '9007'
+                                                                'type' => '9004'
                                                               }
                                                      },
                                           'Reg' => {
@@ -472,94 +472,94 @@ $VAR1 = {
                                                      '4' => 'r8',
                                                      '5' => 'r9'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_set_decode_area',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '450'
                                         },
-                            '215344' => {
+                            '232082' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_stream',
-                                                                'type' => '14547'
+                                                                'type' => '14551'
                                                               },
                                                        '2' => {
                                                                 'name' => 'p_tile_index',
-                                                                'type' => '11815'
+                                                                'type' => '11819'
                                                               },
                                                        '3' => {
                                                                 'name' => 'p_data_size',
-                                                                'type' => '11815'
+                                                                'type' => '11819'
                                                               },
                                                        '4' => {
                                                                 'name' => 'p_tile_x0',
-                                                                'type' => '18269'
+                                                                'type' => '19175'
                                                               },
                                                        '5' => {
                                                                 'name' => 'p_tile_y0',
-                                                                'type' => '18269'
+                                                                'type' => '19175'
                                                               },
                                                        '6' => {
                                                                 'name' => 'p_tile_x1',
                                                                 'offset' => '0',
-                                                                'type' => '18269'
+                                                                'type' => '19175'
                                                               },
                                                        '7' => {
                                                                 'name' => 'p_tile_y1',
-                                                                'offset' => '8',
-                                                                'type' => '18269'
+                                                                'type' => '19175'
                                                               },
                                                        '8' => {
                                                                 'name' => 'p_nb_comps',
-                                                                'offset' => '16',
-                                                                'type' => '11815'
+                                                                'type' => '11819'
                                                               },
                                                        '9' => {
                                                                 'name' => 'p_should_go_on',
-                                                                'offset' => '24',
-                                                                'type' => '60845'
+                                                                'type' => '76832'
                                                               }
                                                      },
                                           'Reg' => {
                                                      '0' => 'rdi',
                                                      '1' => 'rsi',
-                                                     '2' => 'rdx',
-                                                     '3' => 'rcx',
-                                                     '4' => 'r8',
-                                                     '5' => 'r9'
+                                                     '2' => 'rbp',
+                                                     '3' => 'rbx',
+                                                     '4' => 'rcx',
+                                                     '5' => 'r8',
+                                                     '7' => 'rdx',
+                                                     '8' => 'rdx',
+                                                     '9' => 'rdx'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_read_tile_header',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '473'
                                         },
-                            '215659' => {
+                            '232300' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_tile_index',
-                                                                'type' => '9018'
+                                                                'type' => '9015'
                                                               },
                                                        '2' => {
                                                                 'name' => 'p_data',
-                                                                'type' => '9040'
+                                                                'type' => '9037'
                                                               },
                                                        '3' => {
                                                                 'name' => 'p_data_size',
-                                                                'type' => '9018'
+                                                                'type' => '9015'
                                                               },
                                                        '4' => {
                                                                 'name' => 'p_stream',
-                                                                'type' => '14547'
+                                                                'type' => '14551'
                                                               }
                                                      },
                                           'Reg' => {
@@ -569,29 +569,29 @@ $VAR1 = {
                                                      '3' => 'rcx',
                                                      '4' => 'r8'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_decode_tile_data',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '504'
                                         },
-                            '215859' => {
+                            '232500' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_stream',
-                                                                'type' => '14547'
+                                                                'type' => '14551'
                                                               },
                                                        '2' => {
                                                                 'name' => 'p_image',
-                                                                'type' => '44971'
+                                                                'type' => '21108'
                                                               },
                                                        '3' => {
                                                                 'name' => 'tile_index',
-                                                                'type' => '9018'
+                                                                'type' => '9015'
                                                               }
                                                      },
                                           'Reg' => {
@@ -600,54 +600,54 @@ $VAR1 = {
                                                      '2' => 'rdx',
                                                      '3' => 'rcx'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_get_decoded_tile',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '530'
                                         },
-                            '216036' => {
+                            '232677' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '1' => {
                                                                 'name' => 'res_factor',
-                                                                'type' => '9018'
+                                                                'type' => '9015'
                                                               }
                                                      },
                                           'Reg' => {
                                                      '0' => 'rdi',
                                                      '1' => 'rsi'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_set_decoded_resolution_factor',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '554'
                                         },
-                            '216145' => {
+                            '232786' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_format',
-                                                                'type' => '203219'
+                                                                'type' => '219762'
                                                               }
                                                      },
                                           'Reg' => {
                                                      '0' => 'rdi'
                                                    },
-                                          'Return' => '213953',
+                                          'Return' => '230691',
                                           'ShortName' => 'opj_create_compress',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '572'
                                         },
-                            '216370' => {
+                            '233011' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'parameters',
-                                                                'type' => '60863'
+                                                                'type' => '76850'
                                                               }
                                                      },
                                           'Reg' => {
@@ -658,20 +658,20 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '670'
                                         },
-                            '216501' => {
+                            '233142' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '1' => {
                                                                 'name' => 'parameters',
-                                                                'type' => '60863'
+                                                                'type' => '76850'
                                                               },
                                                        '2' => {
                                                                 'name' => 'p_image',
-                                                                'type' => '44971'
+                                                                'type' => '21108'
                                                               }
                                                      },
                                           'Reg' => {
@@ -679,25 +679,25 @@ $VAR1 = {
                                                      '1' => 'rsi',
                                                      '2' => 'rdx'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_setup_encoder',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '731'
                                         },
-                            '216639' => {
+                            '233280' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_image',
-                                                                'type' => '44971'
+                                                                'type' => '21108'
                                                               },
                                                        '2' => {
                                                                 'name' => 'p_stream',
-                                                                'type' => '14547'
+                                                                'type' => '14551'
                                                               }
                                                      },
                                           'Reg' => {
@@ -705,92 +705,92 @@ $VAR1 = {
                                                      '1' => 'rsi',
                                                      '2' => 'rdx'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_start_compress',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '749'
                                         },
-                            '216793' => {
+                            '233434' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_info',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_stream',
-                                                                'type' => '14547'
+                                                                'type' => '14551'
                                                               }
                                                      },
                                           'Reg' => {
                                                      '0' => 'rdi',
                                                      '1' => 'rsi'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_encode',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '768'
                                         },
-                            '216924' => {
+                            '233565' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_stream',
-                                                                'type' => '14547'
+                                                                'type' => '14551'
                                                               }
                                                      },
                                           'Reg' => {
                                                      '0' => 'rdi',
                                                      '1' => 'rsi'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_end_compress',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '785'
                                         },
-                            '217055' => {
+                            '233696' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_stream',
-                                                                'type' => '14547'
+                                                                'type' => '14551'
                                                               }
                                                      },
                                           'Reg' => {
                                                      '0' => 'rdi',
                                                      '1' => 'rsi'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_end_decompress',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '802'
                                         },
-                            '217186' => {
+                            '233827' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'parameters',
-                                                                'type' => '60863'
+                                                                'type' => '76850'
                                                               },
                                                        '1' => {
                                                                 'name' => 'pEncodingMatrix',
-                                                                'type' => '11809'
+                                                                'type' => '11813'
                                                               },
                                                        '2' => {
                                                                 'name' => 'p_dc_shift',
-                                                                'type' => '18269'
+                                                                'type' => '19175'
                                                               },
                                                        '3' => {
                                                                 'name' => 'pNbComp',
-                                                                'type' => '9018'
+                                                                'type' => '9015'
                                                               }
                                                      },
                                           'Reg' => {
@@ -799,33 +799,33 @@ $VAR1 = {
                                                      '2' => 'rdx',
                                                      '3' => 'rcx'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_set_MCT',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '822'
                                         },
-                            '217532' => {
+                            '234173' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_tile_index',
-                                                                'type' => '9018'
+                                                                'type' => '9015'
                                                               },
                                                        '2' => {
                                                                 'name' => 'p_data',
-                                                                'type' => '9040'
+                                                                'type' => '9037'
                                                               },
                                                        '3' => {
                                                                 'name' => 'p_data_size',
-                                                                'type' => '9018'
+                                                                'type' => '9015'
                                                               },
                                                        '4' => {
                                                                 'name' => 'p_stream',
-                                                                'type' => '14547'
+                                                                'type' => '14551'
                                                               }
                                                      },
                                           'Reg' => {
@@ -835,17 +835,17 @@ $VAR1 = {
                                                      '3' => 'rcx',
                                                      '4' => 'r8'
                                                    },
-                                          'Return' => '694',
+                                          'Return' => '2747',
                                           'ShortName' => 'opj_write_tile',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '852'
                                         },
-                            '217732' => {
+                            '234373' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               }
                                                      },
                                           'Reg' => {
@@ -856,20 +856,20 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '879'
                                         },
-                            '217833' => {
+                            '234474' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               },
                                                        '1' => {
                                                                 'name' => 'info_flag',
-                                                                'type' => '9007'
+                                                                'type' => '9004'
                                                               },
                                                        '2' => {
                                                                 'name' => 'output_stream',
-                                                                'type' => '60869'
+                                                                'type' => '76856'
                                                               }
                                                      },
                                           'Reg' => {
@@ -882,44 +882,44 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '897'
                                         },
-                            '217970' => {
+                            '234611' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               }
                                                      },
                                           'Reg' => {
                                                      '0' => 'rdi'
                                                    },
-                                          'Return' => '60875',
+                                          'Return' => '76862',
                                           'ShortName' => 'opj_get_cstr_info',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '913'
                                         },
-                            '218134' => {
+                            '234775' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '213953'
+                                                                'type' => '230691'
                                                               }
                                                      },
                                           'Reg' => {
                                                      '0' => 'rdi'
                                                    },
-                                          'Return' => '58865',
+                                          'Return' => '74658',
                                           'ShortName' => 'opj_get_cstr_index',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '941'
                                         },
-                            '218219' => {
+                            '234860' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_cstr_index',
-                                                                'type' => '218279'
+                                                                'type' => '234920'
                                                               }
                                                      },
                                           'Reg' => {
@@ -930,73 +930,73 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '952'
                                         },
-                            '218285' => {
+                            '234926' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'fname',
-                                                                'type' => '177'
+                                                                'type' => '156'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_size',
-                                                                'type' => '9029'
+                                                                'type' => '9026'
                                                               },
                                                        '2' => {
                                                                 'name' => 'p_is_read_stream',
-                                                                'type' => '694'
+                                                                'type' => '2747'
                                                               }
                                                      },
                                           'Reg' => {
                                                      '0' => 'rdi',
-                                                     '1' => 'rsi',
-                                                     '2' => 'rdx'
+                                                     '1' => 'r12',
+                                                     '2' => 'rbx'
                                                    },
-                                          'Return' => '14547',
+                                          'Return' => '14551',
                                           'ShortName' => 'opj_stream_create_file_stream',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '967'
                                         },
-                            '218705' => {
+                            '235045' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'fname',
-                                                                'type' => '177'
+                                                                'type' => '156'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_is_read_stream',
-                                                                'type' => '694'
+                                                                'type' => '2747'
                                                               }
                                                      },
                                           'Reg' => {
                                                      '0' => 'rdi',
                                                      '1' => 'rsi'
                                                    },
-                                          'Return' => '14547',
+                                          'Return' => '14551',
                                           'ShortName' => 'opj_stream_create_default_file_stream',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '960'
                                         },
-                            '3817' => {
+                            '3808' => {
                                         'Header' => 'openjpeg.h',
-                                        'Return' => '694',
+                                        'Return' => '2747',
                                         'ShortName' => 'opj_has_thread_support',
                                         'Source' => 'thread.c',
-                                        'SourceLine' => '292'
+                                        'SourceLine' => '295'
                                       },
-                            '3847' => {
+                            '3838' => {
                                         'Header' => 'openjpeg.h',
-                                        'Return' => '98',
+                                        'Return' => '87',
                                         'ShortName' => 'opj_get_num_cpus',
                                         'Source' => 'thread.c',
-                                        'SourceLine' => '297'
+                                        'SourceLine' => '300'
                                       },
-                            '45300' => {
+                            '61066' => {
                                          'Header' => 'openjpeg.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'image',
-                                                               'type' => '44971'
+                                                               'type' => '21108'
                                                              }
                                                     },
                                          'Reg' => {
@@ -1007,20 +1007,20 @@ $VAR1 = {
                                          'Source' => 'image.c',
                                          'SourceLine' => '92'
                                        },
-                            '45466' => {
+                            '61244' => {
                                          'Header' => 'openjpeg.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'numcmpts',
-                                                               'type' => '9018'
+                                                               'type' => '9015'
                                                              },
                                                       '1' => {
                                                                'name' => 'cmptparms',
-                                                               'type' => '45817'
+                                                               'type' => '61595'
                                                              },
                                                       '2' => {
                                                                'name' => 'clrspc',
-                                                               'type' => '42276'
+                                                               'type' => '18464'
                                                              }
                                                     },
                                          'Reg' => {
@@ -1028,25 +1028,25 @@ $VAR1 = {
                                                     '1' => 'rsi',
                                                     '2' => 'rdx'
                                                   },
-                                         'Return' => '44971',
+                                         'Return' => '21108',
                                          'ShortName' => 'opj_image_create',
                                          'Source' => 'image.c',
                                          'SourceLine' => '40'
                                        },
-                            '47539' => {
+                            '63317' => {
                                          'Header' => 'openjpeg.h',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'numcmpts',
-                                                               'type' => '9018'
+                                                               'type' => '9015'
                                                              },
                                                       '1' => {
                                                                'name' => 'cmptparms',
-                                                               'type' => '45817'
+                                                               'type' => '61595'
                                                              },
                                                       '2' => {
                                                                'name' => 'clrspc',
-                                                               'type' => '42276'
+                                                               'type' => '18464'
                                                              }
                                                     },
                                          'Reg' => {
@@ -1054,18 +1054,18 @@ $VAR1 = {
                                                     '1' => 'rsi',
                                                     '2' => 'rdx'
                                                   },
-                                         'Return' => '44971',
+                                         'Return' => '21108',
                                          'ShortName' => 'opj_image_tile_create',
                                          'Source' => 'image.c',
                                          'SourceLine' => '228'
                                        },
-                            '47818' => {
+                            '63596' => {
                                          'Header' => 'openjpeg.h',
-                                         'Line' => '1116',
+                                         'Line' => '1119',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'ptr',
-                                                               'type' => '141'
+                                                               'type' => '130'
                                                              }
                                                     },
                                          'Reg' => {
@@ -1076,19 +1076,19 @@ $VAR1 = {
                                          'Source' => 'openjpeg.c',
                                          'SourceLine' => '1019'
                                        },
-                            '47882' => {
+                            '63660' => {
                                          'Header' => 'openjpeg.h',
-                                         'Line' => '1106',
+                                         'Line' => '1109',
                                          'Param' => {
                                                       '0' => {
                                                                'name' => 'size',
-                                                               'type' => '9029'
+                                                               'type' => '9026'
                                                              }
                                                     },
                                          'Reg' => {
                                                     '0' => 'rdi'
                                                   },
-                                         'Return' => '141',
+                                         'Return' => '130',
                                          'ShortName' => 'opj_image_data_alloc',
                                          'Source' => 'openjpeg.c',
                                          'SourceLine' => '1012'
@@ -1160,45 +1160,48 @@ $VAR1 = {
                                    'Name' => 'void',
                                    'Type' => 'Intrinsic'
                                  },
-                          '105' => {
-                                     'Name' => 'long',
+                          '101' => {
+                                     'BaseType' => '94',
+                                     'Header' => 'types.h',
+                                     'Line' => '141',
+                                     'Name' => '__off_t',
                                      'Size' => '8',
-                                     'Type' => 'Intrinsic'
+                                     'Type' => 'Typedef'
                                    },
-                          '11085' => {
-                                       'BaseType' => '163',
+                          '11089' => {
+                                       'BaseType' => '2236',
                                        'Header' => 'openjpeg.h',
                                        'Line' => '115',
                                        'Name' => 'OPJ_FLOAT32',
                                        'Size' => '4',
                                        'Type' => 'Typedef'
                                      },
-                          '11129' => {
-                                       'BaseType' => '105',
+                          '11133' => {
+                                       'BaseType' => '94',
                                        'Header' => 'stdint.h',
-                                       'Line' => '40',
+                                       'Line' => '41',
                                        'Name' => 'int64_t',
                                        'Size' => '8',
                                        'Type' => 'Typedef'
                                      },
-                          '11151' => {
-                                       'BaseType' => '56',
+                          '11155' => {
+                                       'BaseType' => '66',
                                        'Header' => 'stdint.h',
-                                       'Line' => '55',
+                                       'Line' => '56',
                                        'Name' => 'uint64_t',
                                        'Size' => '8',
                                        'Type' => 'Typedef'
                                      },
-                          '11184' => {
-                                       'BaseType' => '11151',
+                          '11188' => {
+                                       'BaseType' => '11155',
                                        'Header' => 'openjpeg.h',
                                        'Line' => '128',
                                        'Name' => 'OPJ_UINT64',
                                        'Size' => '8',
                                        'Type' => 'Typedef'
                                      },
-                          '11195' => {
-                                       'BaseType' => '11129',
+                          '11199' => {
+                                       'BaseType' => '11133',
                                        'Header' => 'openjpeg.h',
                                        'Line' => '130',
                                        'Name' => 'OPJ_OFF_T',
@@ -1206,452 +1209,214 @@ $VAR1 = {
                                        'Type' => 'Typedef'
                                      },
                           '112' => {
-                                     'BaseType' => '105',
+                                     'BaseType' => '94',
                                      'Header' => 'types.h',
-                                     'Line' => '131',
-                                     'Name' => '__off_t',
+                                     'Line' => '142',
+                                     'Name' => '__off64_t',
                                      'Size' => '8',
                                      'Type' => 'Typedef'
                                    },
-                          '11217' => {
-                                       'BaseType' => '11229',
+                          '11221' => {
+                                       'BaseType' => '11233',
                                        'Header' => 'openjpeg.h',
                                        'Line' => '313',
                                        'Name' => 'opj_msg_callback',
                                        'Size' => '8',
                                        'Type' => 'Typedef'
                                      },
-                          '11229' => {
+                          '11233' => {
                                        'Name' => 'void(*)(char const*, void*)',
                                        'Param' => {
                                                     '0' => {
-                                                             'type' => '177'
+                                                             'type' => '156'
                                                            },
                                                     '1' => {
-                                                             'type' => '141'
+                                                             'type' => '130'
                                                            }
                                                   },
                                        'Return' => '1',
                                        'Size' => '8',
                                        'Type' => 'FuncPtr'
                                      },
-                          '11251' => {
-                                       'BaseType' => '11263',
+                          '11255' => {
+                                       'BaseType' => '11267',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '594',
+                                       'Line' => '597',
                                        'Name' => 'opj_stream_read_fn',
                                        'Size' => '8',
                                        'Type' => 'Typedef'
                                      },
-                          '11263' => {
+                          '11267' => {
                                        'Name' => 'OPJ_SIZE_T(*)(void*, OPJ_SIZE_T, void*)',
                                        'Param' => {
                                                     '0' => {
-                                                             'type' => '141'
+                                                             'type' => '130'
                                                            },
                                                     '1' => {
-                                                             'type' => '9029'
+                                                             'type' => '9026'
                                                            },
                                                     '2' => {
-                                                             'type' => '141'
+                                                             'type' => '130'
                                                            }
                                                   },
-                                       'Return' => '9029',
+                                       'Return' => '9026',
                                        'Size' => '8',
                                        'Type' => 'FuncPtr'
                                      },
-                          '11294' => {
-                                       'BaseType' => '11263',
+                          '11298' => {
+                                       'BaseType' => '11267',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '600',
+                                       'Line' => '603',
                                        'Name' => 'opj_stream_write_fn',
                                        'Size' => '8',
                                        'Type' => 'Typedef'
                                      },
-                          '11306' => {
-                                       'BaseType' => '11318',
+                          '11310' => {
+                                       'BaseType' => '11322',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '606',
+                                       'Line' => '609',
                                        'Name' => 'opj_stream_skip_fn',
                                        'Size' => '8',
                                        'Type' => 'Typedef'
                                      },
-                          '11318' => {
+                          '11322' => {
                                        'Name' => 'OPJ_OFF_T(*)(OPJ_OFF_T, void*)',
                                        'Param' => {
                                                     '0' => {
-                                                             'type' => '11195'
+                                                             'type' => '11199'
                                                            },
                                                     '1' => {
-                                                             'type' => '141'
+                                                             'type' => '130'
                                                            }
                                                   },
-                                       'Return' => '11195',
+                                       'Return' => '11199',
                                        'Size' => '8',
                                        'Type' => 'FuncPtr'
                                      },
-                          '11344' => {
-                                       'BaseType' => '11356',
+                          '11348' => {
+                                       'BaseType' => '11360',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '612',
+                                       'Line' => '615',
                                        'Name' => 'opj_stream_seek_fn',
                                        'Size' => '8',
                                        'Type' => 'Typedef'
                                      },
-                          '11356' => {
+                          '11360' => {
                                        'Name' => 'OPJ_BOOL(*)(OPJ_OFF_T, void*)',
                                        'Param' => {
                                                     '0' => {
-                                                             'type' => '11195'
+                                                             'type' => '11199'
                                                            },
                                                     '1' => {
-                                                             'type' => '141'
+                                                             'type' => '130'
                                                            }
                                                   },
-                                       'Return' => '694',
+                                       'Return' => '2747',
                                        'Size' => '8',
                                        'Type' => 'FuncPtr'
                                      },
-                          '11382' => {
-                                       'BaseType' => '705',
+                          '11386' => {
+                                       'BaseType' => '781',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '618',
+                                       'Line' => '621',
                                        'Name' => 'opj_stream_free_user_data_fn',
                                        'Size' => '8',
                                        'Type' => 'Typedef'
                                      },
-                          '11411' => {
-                                       'BaseType' => '141',
+                          '11415' => {
+                                       'BaseType' => '130',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '623',
+                                       'Line' => '626',
                                        'Name' => 'opj_stream_t',
                                        'Size' => '8',
                                        'Type' => 'Typedef'
                                      },
-                          '11809' => {
-                                       'BaseType' => '11085',
+                          '11813' => {
+                                       'BaseType' => '11089',
                                        'Name' => 'OPJ_FLOAT32*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '11815' => {
-                                       'BaseType' => '9018',
+                          '11819' => {
+                                       'BaseType' => '9015',
                                        'Name' => 'OPJ_UINT32*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '123' => {
-                                     'BaseType' => '105',
-                                     'Header' => 'types.h',
-                                     'Line' => '132',
-                                     'Name' => '__off64_t',
-                                     'Size' => '8',
-                                     'Type' => 'Typedef'
-                                   },
-                          '141' => {
+                          '130' => {
                                      'BaseType' => '1',
                                      'Name' => 'void*',
                                      'Size' => '8',
                                      'Type' => 'Pointer'
                                    },
-                          '143' => {
-                                     'BaseType' => '149',
+                          '132' => {
+                                     'BaseType' => '138',
                                      'Name' => 'char*',
                                      'Size' => '8',
                                      'Type' => 'Pointer'
                                    },
-                          '14547' => {
-                                       'BaseType' => '11411',
-                                       'Name' => 'opj_stream_t*',
-                                       'Size' => '8',
-                                       'Type' => 'Pointer'
-                                     },
-                          '149' => {
+                          '138' => {
                                      'Name' => 'char',
                                      'Size' => '1',
                                      'Type' => 'Intrinsic'
                                    },
-                          '152283' => {
-                                        'BaseType' => '60875',
-                                        'Name' => 'opj_codestream_info_v2_t**',
-                                        'Size' => '8',
-                                        'Type' => 'Pointer'
-                                      },
-                          '163' => {
-                                     'Name' => 'float',
-                                     'Size' => '4',
-                                     'Type' => 'Intrinsic'
-                                   },
-                          '170' => {
-                                     'Name' => 'double',
+                          '145' => {
+                                     'BaseType' => '66',
+                                     'Header' => 'stddef.h',
+                                     'Line' => '212',
+                                     'Name' => 'size_t',
                                      'Size' => '8',
-                                     'Type' => 'Intrinsic'
+                                     'Type' => 'Typedef'
                                    },
-                          '177' => {
-                                     'BaseType' => '183',
+                          '14551' => {
+                                       'BaseType' => '11415',
+                                       'Name' => 'opj_stream_t*',
+                                       'Size' => '8',
+                                       'Type' => 'Pointer'
+                                     },
+                          '156' => {
+                                     'BaseType' => '162',
                                      'Name' => 'char const*',
                                      'Size' => '8',
                                      'Type' => 'Pointer'
                                    },
-                          '18269' => {
-                                       'BaseType' => '9007',
-                                       'Name' => 'OPJ_INT32*',
-                                       'Size' => '8',
-                                       'Type' => 'Pointer'
-                                     },
-                          '18281' => {
-                                       'BaseType' => '9018',
-                                       'Name' => 'OPJ_UINT32[33]',
-                                       'Size' => '132',
-                                       'Type' => 'Array'
-                                     },
-                          '183' => {
-                                     'BaseType' => '149',
+                          '162' => {
+                                     'BaseType' => '138',
                                      'Name' => 'char const',
                                      'Size' => '1',
                                      'Type' => 'Const'
                                    },
-                          '188' => {
-                                     'Header' => 'libio.h',
-                                     'Line' => '245',
-                                     'Memb' => {
-                                                 '0' => {
-                                                          'name' => '_flags',
-                                                          'offset' => '0',
-                                                          'type' => '98'
-                                                        },
-                                                 '1' => {
-                                                          'name' => '_IO_read_ptr',
-                                                          'offset' => '8',
-                                                          'type' => '143'
-                                                        },
-                                                 '10' => {
-                                                           'name' => '_IO_backup_base',
-                                                           'offset' => '80',
-                                                           'type' => '143'
-                                                         },
-                                                 '11' => {
-                                                           'name' => '_IO_save_end',
-                                                           'offset' => '88',
-                                                           'type' => '143'
-                                                         },
-                                                 '12' => {
-                                                           'name' => '_markers',
-                                                           'offset' => '96',
-                                                           'type' => '644'
-                                                         },
-                                                 '13' => {
-                                                           'name' => '_chain',
-                                                           'offset' => '104',
-                                                           'type' => '650'
-                                                         },
-                                                 '14' => {
-                                                           'name' => '_fileno',
-                                                           'offset' => '112',
-                                                           'type' => '98'
-                                                         },
-                                                 '15' => {
-                                                           'name' => '_flags2',
-                                                           'offset' => '116',
-                                                           'type' => '98'
-                                                         },
-                                                 '16' => {
-                                                           'name' => '_old_offset',
-                                                           'offset' => '120',
-                                                           'type' => '112'
-                                                         },
-                                                 '17' => {
-                                                           'name' => '_cur_column',
-                                                           'offset' => '128',
-                                                           'type' => '70'
-                                                         },
-                                                 '18' => {
-                                                           'name' => '_vtable_offset',
-                                                           'offset' => '130',
-                                                           'type' => '84'
-                                                         },
-                                                 '19' => {
-                                                           'name' => '_shortbuf',
-                                                           'offset' => '131',
-                                                           'type' => '656'
-                                                         },
-                                                 '2' => {
-                                                          'name' => '_IO_read_end',
-                                                          'offset' => '16',
-                                                          'type' => '143'
-                                                        },
-                                                 '20' => {
-                                                           'name' => '_lock',
-                                                           'offset' => '136',
-                                                           'type' => '672'
-                                                         },
-                                                 '21' => {
-                                                           'name' => '_offset',
-                                                           'offset' => '144',
-                                                           'type' => '123'
-                                                         },
-                                                 '22' => {
-                                                           'name' => '__pad1',
-                                                           'offset' => '152',
-                                                           'type' => '141'
-                                                         },
-                                                 '23' => {
-                                                           'name' => '__pad2',
-                                                           'offset' => '160',
-                                                           'type' => '141'
-                                                         },
-                                                 '24' => {
-                                                           'name' => '__pad3',
-                                                           'offset' => '168',
-                                                           'type' => '141'
-                                                         },
-                                                 '25' => {
-                                                           'name' => '__pad4',
-                                                           'offset' => '176',
-                                                           'type' => '141'
-                                                         },
-                                                 '26' => {
-                                                           'name' => '__pad5',
-                                                           'offset' => '184',
-                                                           'type' => '45'
-                                                         },
-                                                 '27' => {
-                                                           'name' => '_mode',
-                                                           'offset' => '192',
-                                                           'type' => '98'
-                                                         },
-                                                 '28' => {
-                                                           'name' => '_unused2',
-                                                           'offset' => '196',
-                                                           'type' => '678'
-                                                         },
-                                                 '3' => {
-                                                          'name' => '_IO_read_base',
-                                                          'offset' => '24',
-                                                          'type' => '143'
-                                                        },
-                                                 '4' => {
-                                                          'name' => '_IO_write_base',
-                                                          'offset' => '32',
-                                                          'type' => '143'
-                                                        },
-                                                 '5' => {
-                                                          'name' => '_IO_write_ptr',
-                                                          'offset' => '40',
-                                                          'type' => '143'
-                                                        },
-                                                 '6' => {
-                                                          'name' => '_IO_write_end',
-                                                          'offset' => '48',
-                                                          'type' => '143'
-                                                        },
-                                                 '7' => {
-                                                          'name' => '_IO_buf_base',
-                                                          'offset' => '56',
-                                                          'type' => '143'
-                                                        },
-                                                 '8' => {
-                                                          'name' => '_IO_buf_end',
-                                                          'offset' => '64',
-                                                          'type' => '143'
-                                                        },
-                                                 '9' => {
-                                                          'name' => '_IO_save_base',
-                                                          'offset' => '72',
-                                                          'type' => '143'
-                                                        }
-                                               },
-                                     'Name' => 'struct _IO_FILE',
-                                     'PrivateABI' => 1,
-                                     'Size' => '216',
-                                     'Type' => 'Struct'
-                                   },
-                          '203169' => {
-                                        'Header' => 'openjpeg.h',
-                                        'Line' => '292',
-                                        'Memb' => {
-                                                    '0' => {
-                                                             'name' => 'OPJ_CODEC_UNKNOWN',
-                                                             'value' => '18446744073709551615'
-                                                           },
-                                                    '1' => {
-                                                             'name' => 'OPJ_CODEC_J2K',
-                                                             'value' => '0'
-                                                           },
-                                                    '2' => {
-                                                             'name' => 'OPJ_CODEC_JPT',
-                                                             'value' => '1'
-                                                           },
-                                                    '3' => {
-                                                             'name' => 'OPJ_CODEC_JP2',
-                                                             'value' => '2'
-                                                           },
-                                                    '4' => {
-                                                             'name' => 'OPJ_CODEC_JPP',
-                                                             'value' => '3'
-                                                           },
-                                                    '5' => {
-                                                             'name' => 'OPJ_CODEC_JPX',
-                                                             'value' => '4'
-                                                           }
-                                                  },
-                                        'Name' => 'enum CODEC_FORMAT',
-                                        'Size' => '4',
-                                        'Type' => 'Enum'
-                                      },
-                          '203219' => {
-                                        'BaseType' => '203169',
-                                        'Header' => 'openjpeg.h',
-                                        'Line' => '299',
-                                        'Name' => 'OPJ_CODEC_FORMAT',
-                                        'Size' => '4',
-                                        'Type' => 'Typedef'
-                                      },
-                          '204976' => {
-                                        'BaseType' => '141',
-                                        'Header' => 'openjpeg.h',
-                                        'Line' => '575',
-                                        'Name' => 'opj_codec_t',
-                                        'Size' => '8',
-                                        'Type' => 'Typedef'
-                                      },
-                          '213953' => {
-                                        'BaseType' => '204976',
-                                        'Name' => 'opj_codec_t*',
-                                        'Size' => '8',
-                                        'Type' => 'Pointer'
-                                      },
-                          '218279' => {
-                                        'BaseType' => '58865',
-                                        'Name' => 'opj_codestream_index_t**',
+                          '168555' => {
+                                        'BaseType' => '76862',
+                                        'Name' => 'opj_codestream_info_v2_t**',
                                         'Size' => '8',
                                         'Type' => 'Pointer'
                                       },
-                          '42015' => {
-                                       'BaseType' => '149',
+                          '18203' => {
+                                       'BaseType' => '138',
                                        'Header' => 'openjpeg.h',
                                        'Line' => '114',
                                        'Name' => 'OPJ_CHAR',
                                        'Size' => '1',
                                        'Type' => 'Typedef'
                                      },
-                          '42070' => {
-                                       'BaseType' => '70',
+                          '18247' => {
+                                       'BaseType' => '52',
                                        'Header' => 'stdint.h',
-                                       'Line' => '49',
+                                       'Line' => '50',
                                        'Name' => 'uint16_t',
                                        'Size' => '2',
                                        'Type' => 'Typedef'
                                      },
-                          '42103' => {
-                                       'BaseType' => '42070',
+                          '18280' => {
+                                       'BaseType' => '18247',
                                        'Header' => 'openjpeg.h',
                                        'Line' => '124',
                                        'Name' => 'OPJ_UINT16',
                                        'Size' => '2',
                                        'Type' => 'Typedef'
                                      },
-                          '42158' => {
+                          '18346' => {
                                        'Header' => 'openjpeg.h',
                                        'Line' => '267',
                                        'Memb' => {
@@ -1684,15 +1449,15 @@ $VAR1 = {
                                        'Size' => '4',
                                        'Type' => 'Enum'
                                      },
-                          '42208' => {
-                                       'BaseType' => '42158',
+                          '18396' => {
+                                       'BaseType' => '18346',
                                        'Header' => 'openjpeg.h',
                                        'Line' => '274',
                                        'Name' => 'OPJ_PROG_ORDER',
                                        'Size' => '4',
                                        'Type' => 'Typedef'
                                      },
-                          '42220' => {
+                          '18408' => {
                                        'Header' => 'openjpeg.h',
                                        'Line' => '279',
                                        'Memb' => {
@@ -1729,464 +1494,783 @@ $VAR1 = {
                                        'Size' => '4',
                                        'Type' => 'Enum'
                                      },
-                          '42276' => {
-                                       'BaseType' => '42220',
+                          '18464' => {
+                                       'BaseType' => '18408',
                                        'Header' => 'openjpeg.h',
                                        'Line' => '287',
                                        'Name' => 'OPJ_COLOR_SPACE',
                                        'Size' => '4',
                                        'Type' => 'Typedef'
                                      },
-                          '42288' => {
+                          '18476' => {
                                        'Header' => 'openjpeg.h',
                                        'Line' => '325',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'resno0',
                                                             'offset' => '0',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '1' => {
                                                             'name' => 'compno0',
                                                             'offset' => '4',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '10' => {
                                                              'name' => 'progorder',
                                                              'offset' => '40',
-                                                             'type' => '42768'
+                                                             'type' => '18956'
                                                            },
                                                    '11' => {
                                                              'name' => 'tile',
                                                              'offset' => '48',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '12' => {
                                                              'name' => 'tx0',
                                                              'offset' => '52',
-                                                             'type' => '9007'
+                                                             'type' => '9004'
                                                            },
                                                    '13' => {
                                                              'name' => 'tx1',
                                                              'offset' => '56',
-                                                             'type' => '9007'
+                                                             'type' => '9004'
                                                            },
                                                    '14' => {
                                                              'name' => 'ty0',
                                                              'offset' => '60',
-                                                             'type' => '9007'
+                                                             'type' => '9004'
                                                            },
                                                    '15' => {
                                                              'name' => 'ty1',
                                                              'offset' => '64',
-                                                             'type' => '9007'
+                                                             'type' => '9004'
                                                            },
                                                    '16' => {
                                                              'name' => 'layS',
                                                              'offset' => '68',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '17' => {
                                                              'name' => 'resS',
                                                              'offset' => '72',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '18' => {
                                                              'name' => 'compS',
                                                              'offset' => '76',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '19' => {
                                                              'name' => 'prcS',
                                                              'offset' => '80',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '2' => {
                                                             'name' => 'layno1',
                                                             'offset' => '8',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '20' => {
                                                              'name' => 'layE',
                                                              'offset' => '84',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '21' => {
                                                              'name' => 'resE',
                                                              'offset' => '88',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '22' => {
                                                              'name' => 'compE',
                                                              'offset' => '92',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '23' => {
                                                              'name' => 'prcE',
                                                              'offset' => '96',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '24' => {
                                                              'name' => 'txS',
                                                              'offset' => '100',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '25' => {
                                                              'name' => 'txE',
                                                              'offset' => '104',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '26' => {
                                                              'name' => 'tyS',
                                                              'offset' => '108',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '27' => {
                                                              'name' => 'tyE',
                                                              'offset' => '112',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '28' => {
                                                              'name' => 'dx',
                                                              'offset' => '116',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '29' => {
                                                              'name' => 'dy',
                                                              'offset' => '120',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '3' => {
                                                             'name' => 'resno1',
                                                             'offset' => '12',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '30' => {
                                                              'name' => 'lay_t',
                                                              'offset' => '124',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '31' => {
                                                              'name' => 'res_t',
                                                              'offset' => '128',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '32' => {
                                                              'name' => 'comp_t',
                                                              'offset' => '132',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '33' => {
                                                              'name' => 'prc_t',
                                                              'offset' => '136',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '34' => {
                                                              'name' => 'tx0_t',
                                                              'offset' => '140',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '35' => {
                                                              'name' => 'ty0_t',
                                                              'offset' => '144',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '4' => {
                                                             'name' => 'compno1',
                                                             'offset' => '16',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '5' => {
                                                             'name' => 'layno0',
                                                             'offset' => '20',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '6' => {
                                                             'name' => 'precno0',
                                                             'offset' => '24',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '7' => {
                                                             'name' => 'precno1',
                                                             'offset' => '28',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '8' => {
                                                             'name' => 'prg1',
                                                             'offset' => '32',
-                                                            'type' => '42208'
+                                                            'type' => '18396'
                                                           },
                                                    '9' => {
                                                             'name' => 'prg',
                                                             'offset' => '36',
-                                                            'type' => '42208'
+                                                            'type' => '18396'
                                                           }
                                                  },
                                        'Name' => 'struct opj_poc',
                                        'Size' => '148',
                                        'Type' => 'Struct'
                                      },
-                          '42768' => {
-                                       'BaseType' => '42015',
+                          '18956' => {
+                                       'BaseType' => '18203',
                                        'Name' => 'OPJ_CHAR[5]',
                                        'Size' => '5',
                                        'Type' => 'Array'
                                      },
-                          '42784' => {
-                                       'BaseType' => '42288',
+                          '18972' => {
+                                       'BaseType' => '18476',
                                        'Header' => 'openjpeg.h',
                                        'Line' => '348',
                                        'Name' => 'opj_poc_t',
                                        'Size' => '148',
                                        'Type' => 'Typedef'
                                      },
-                          '42796' => {
-                                       'BaseType' => '42784',
+                          '18984' => {
+                                       'BaseType' => '18972',
                                        'Name' => 'opj_poc_t[32]',
                                        'Size' => '4736',
                                        'Type' => 'Array'
                                      },
-                          '42812' => {
+                          '19000' => {
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '634',
+                                       'Line' => '637',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'dx',
                                                             'offset' => '0',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '1' => {
                                                             'name' => 'dy',
                                                             'offset' => '4',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '10' => {
                                                              'name' => 'factor',
                                                              'offset' => '40',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '11' => {
                                                              'name' => 'data',
                                                              'offset' => '48',
-                                                             'type' => '18269'
+                                                             'type' => '19175'
                                                            },
                                                    '12' => {
                                                              'name' => 'alpha',
                                                              'offset' => '56',
-                                                             'type' => '42103'
+                                                             'type' => '18280'
                                                            },
                                                    '2' => {
                                                             'name' => 'w',
                                                             'offset' => '8',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '3' => {
                                                             'name' => 'h',
                                                             'offset' => '12',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '4' => {
                                                             'name' => 'x0',
                                                             'offset' => '16',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '5' => {
                                                             'name' => 'y0',
                                                             'offset' => '20',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '6' => {
                                                             'name' => 'prec',
                                                             'offset' => '24',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '7' => {
                                                             'name' => 'bpp',
                                                             'offset' => '28',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '8' => {
                                                             'name' => 'sgnd',
                                                             'offset' => '32',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '9' => {
                                                             'name' => 'resno_decoded',
                                                             'offset' => '36',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           }
                                                  },
                                        'Name' => 'struct opj_image_comp',
                                        'Size' => '64',
                                        'Type' => 'Struct'
                                      },
-                          '42993' => {
-                                       'BaseType' => '42812',
+                          '19175' => {
+                                       'BaseType' => '9004',
+                                       'Name' => 'OPJ_INT32*',
+                                       'Size' => '8',
+                                       'Type' => 'Pointer'
+                                     },
+                          '19181' => {
+                                       'BaseType' => '19000',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '661',
+                                       'Line' => '664',
                                        'Name' => 'opj_image_comp_t',
                                        'Size' => '64',
                                        'Type' => 'Typedef'
                                      },
-                          '43005' => {
+                          '19193' => {
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '666',
+                                       'Line' => '669',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'x0',
                                                             'offset' => '0',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '1' => {
                                                             'name' => 'y0',
                                                             'offset' => '4',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '2' => {
                                                             'name' => 'x1',
                                                             'offset' => '8',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '3' => {
                                                             'name' => 'y1',
                                                             'offset' => '12',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '4' => {
                                                             'name' => 'numcomps',
                                                             'offset' => '16',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '5' => {
                                                             'name' => 'color_space',
                                                             'offset' => '20',
-                                                            'type' => '42276'
+                                                            'type' => '18464'
                                                           },
                                                    '6' => {
                                                             'name' => 'comps',
                                                             'offset' => '24',
-                                                            'type' => '43132'
+                                                            'type' => '19320'
                                                           },
                                                    '7' => {
                                                             'name' => 'icc_profile_buf',
                                                             'offset' => '32',
-                                                            'type' => '9040'
+                                                            'type' => '9037'
                                                           },
                                                    '8' => {
                                                             'name' => 'icc_profile_len',
                                                             'offset' => '40',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           }
                                                  },
                                        'Name' => 'struct opj_image',
                                        'Size' => '48',
                                        'Type' => 'Struct'
                                      },
-                          '43132' => {
-                                       'BaseType' => '42993',
+                          '19320' => {
+                                       'BaseType' => '19181',
                                        'Name' => 'opj_image_comp_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '43144' => {
-                                       'BaseType' => '43005',
+                          '19332' => {
+                                       'BaseType' => '19193',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '685',
+                                       'Line' => '688',
                                        'Name' => 'opj_image_t',
                                        'Size' => '48',
                                        'Type' => 'Typedef'
                                      },
-                          '43156' => {
+                          '19344' => {
+                                       'BaseType' => '9015',
+                                       'Name' => 'OPJ_UINT32[33]',
+                                       'Size' => '132',
+                                       'Type' => 'Array'
+                                     },
+                          '21108' => {
+                                       'BaseType' => '19332',
+                                       'Name' => 'opj_image_t*',
+                                       'Size' => '8',
+                                       'Type' => 'Pointer'
+                                     },
+                          '219712' => {
+                                        'Header' => 'openjpeg.h',
+                                        'Line' => '292',
+                                        'Memb' => {
+                                                    '0' => {
+                                                             'name' => 'OPJ_CODEC_UNKNOWN',
+                                                             'value' => '18446744073709551615'
+                                                           },
+                                                    '1' => {
+                                                             'name' => 'OPJ_CODEC_J2K',
+                                                             'value' => '0'
+                                                           },
+                                                    '2' => {
+                                                             'name' => 'OPJ_CODEC_JPT',
+                                                             'value' => '1'
+                                                           },
+                                                    '3' => {
+                                                             'name' => 'OPJ_CODEC_JP2',
+                                                             'value' => '2'
+                                                           },
+                                                    '4' => {
+                                                             'name' => 'OPJ_CODEC_JPP',
+                                                             'value' => '3'
+                                                           },
+                                                    '5' => {
+                                                             'name' => 'OPJ_CODEC_JPX',
+                                                             'value' => '4'
+                                                           }
+                                                  },
+                                        'Name' => 'enum CODEC_FORMAT',
+                                        'Size' => '4',
+                                        'Type' => 'Enum'
+                                      },
+                          '219762' => {
+                                        'BaseType' => '219712',
+                                        'Header' => 'openjpeg.h',
+                                        'Line' => '299',
+                                        'Name' => 'OPJ_CODEC_FORMAT',
+                                        'Size' => '4',
+                                        'Type' => 'Typedef'
+                                      },
+                          '221519' => {
+                                        'BaseType' => '130',
+                                        'Header' => 'openjpeg.h',
+                                        'Line' => '578',
+                                        'Name' => 'opj_codec_t',
+                                        'Size' => '8',
+                                        'Type' => 'Typedef'
+                                      },
+                          '2236' => {
+                                      'Name' => 'float',
+                                      'Size' => '4',
+                                      'Type' => 'Intrinsic'
+                                    },
+                          '2243' => {
+                                      'Name' => 'double',
+                                      'Size' => '8',
+                                      'Type' => 'Intrinsic'
+                                    },
+                          '2250' => {
+                                      'Header' => 'libio.h',
+                                      'Line' => '273',
+                                      'Memb' => {
+                                                  '0' => {
+                                                           'name' => '_flags',
+                                                           'offset' => '0',
+                                                           'type' => '87'
+                                                         },
+                                                  '1' => {
+                                                           'name' => '_IO_read_ptr',
+                                                           'offset' => '8',
+                                                           'type' => '132'
+                                                         },
+                                                  '10' => {
+                                                            'name' => '_IO_backup_base',
+                                                            'offset' => '80',
+                                                            'type' => '132'
+                                                          },
+                                                  '11' => {
+                                                            'name' => '_IO_save_end',
+                                                            'offset' => '88',
+                                                            'type' => '132'
+                                                          },
+                                                  '12' => {
+                                                            'name' => '_markers',
+                                                            'offset' => '96',
+                                                            'type' => '2697'
+                                                          },
+                                                  '13' => {
+                                                            'name' => '_chain',
+                                                            'offset' => '104',
+                                                            'type' => '2703'
+                                                          },
+                                                  '14' => {
+                                                            'name' => '_fileno',
+                                                            'offset' => '112',
+                                                            'type' => '87'
+                                                          },
+                                                  '15' => {
+                                                            'name' => '_flags2',
+                                                            'offset' => '116',
+                                                            'type' => '87'
+                                                          },
+                                                  '16' => {
+                                                            'name' => '_old_offset',
+                                                            'offset' => '120',
+                                                            'type' => '101'
+                                                          },
+                                                  '17' => {
+                                                            'name' => '_cur_column',
+                                                            'offset' => '128',
+                                                            'type' => '52'
+                                                          },
+                                                  '18' => {
+                                                            'name' => '_vtable_offset',
+                                                            'offset' => '130',
+                                                            'type' => '73'
+                                                          },
+                                                  '19' => {
+                                                            'name' => '_shortbuf',
+                                                            'offset' => '131',
+                                                            'type' => '2709'
+                                                          },
+                                                  '2' => {
+                                                           'name' => '_IO_read_end',
+                                                           'offset' => '16',
+                                                           'type' => '132'
+                                                         },
+                                                  '20' => {
+                                                            'name' => '_lock',
+                                                            'offset' => '136',
+                                                            'type' => '2725'
+                                                          },
+                                                  '21' => {
+                                                            'name' => '_offset',
+                                                            'offset' => '144',
+                                                            'type' => '112'
+                                                          },
+                                                  '22' => {
+                                                            'name' => '__pad1',
+                                                            'offset' => '152',
+                                                            'type' => '130'
+                                                          },
+                                                  '23' => {
+                                                            'name' => '__pad2',
+                                                            'offset' => '160',
+                                                            'type' => '130'
+                                                          },
+                                                  '24' => {
+                                                            'name' => '__pad3',
+                                                            'offset' => '168',
+                                                            'type' => '130'
+                                                          },
+                                                  '25' => {
+                                                            'name' => '__pad4',
+                                                            'offset' => '176',
+                                                            'type' => '130'
+                                                          },
+                                                  '26' => {
+                                                            'name' => '__pad5',
+                                                            'offset' => '184',
+                                                            'type' => '145'
+                                                          },
+                                                  '27' => {
+                                                            'name' => '_mode',
+                                                            'offset' => '192',
+                                                            'type' => '87'
+                                                          },
+                                                  '28' => {
+                                                            'name' => '_unused2',
+                                                            'offset' => '196',
+                                                            'type' => '2731'
+                                                          },
+                                                  '3' => {
+                                                           'name' => '_IO_read_base',
+                                                           'offset' => '24',
+                                                           'type' => '132'
+                                                         },
+                                                  '4' => {
+                                                           'name' => '_IO_write_base',
+                                                           'offset' => '32',
+                                                           'type' => '132'
+                                                         },
+                                                  '5' => {
+                                                           'name' => '_IO_write_ptr',
+                                                           'offset' => '40',
+                                                           'type' => '132'
+                                                         },
+                                                  '6' => {
+                                                           'name' => '_IO_write_end',
+                                                           'offset' => '48',
+                                                           'type' => '132'
+                                                         },
+                                                  '7' => {
+                                                           'name' => '_IO_buf_base',
+                                                           'offset' => '56',
+                                                           'type' => '132'
+                                                         },
+                                                  '8' => {
+                                                           'name' => '_IO_buf_end',
+                                                           'offset' => '64',
+                                                           'type' => '132'
+                                                         },
+                                                  '9' => {
+                                                           'name' => '_IO_save_base',
+                                                           'offset' => '72',
+                                                           'type' => '132'
+                                                         }
+                                                },
+                                      'Name' => 'struct _IO_FILE',
+                                      'PrivateABI' => 1,
+                                      'Size' => '216',
+                                      'Type' => 'Struct'
+                                    },
+                          '230691' => {
+                                        'BaseType' => '221519',
+                                        'Name' => 'opj_codec_t*',
+                                        'Size' => '8',
+                                        'Type' => 'Pointer'
+                                      },
+                          '234920' => {
+                                        'BaseType' => '74658',
+                                        'Name' => 'opj_codestream_index_t**',
+                                        'Size' => '8',
+                                        'Type' => 'Pointer'
+                                      },
+                          '2641' => {
+                                      'Header' => 'libio.h',
+                                      'Line' => '182',
+                                      'Name' => '_IO_lock_t',
+                                      'Type' => 'Typedef'
+                                    },
+                          '2648' => {
+                                      'Header' => 'libio.h',
+                                      'Line' => '188',
+                                      'Memb' => {
+                                                  '0' => {
+                                                           'name' => '_next',
+                                                           'offset' => '0',
+                                                           'type' => '2697'
+                                                         },
+                                                  '1' => {
+                                                           'name' => '_sbuf',
+                                                           'offset' => '8',
+                                                           'type' => '2703'
+                                                         },
+                                                  '2' => {
+                                                           'name' => '_pos',
+                                                           'offset' => '16',
+                                                           'type' => '87'
+                                                         }
+                                                },
+                                      'Name' => 'struct _IO_marker',
+                                      'PrivateABI' => 1,
+                                      'Size' => '24',
+                                      'Type' => 'Struct'
+                                    },
+                          '2697' => {
+                                      'BaseType' => '2648',
+                                      'Name' => 'struct _IO_marker*',
+                                      'Size' => '8',
+                                      'Type' => 'Pointer'
+                                    },
+                          '2703' => {
+                                      'BaseType' => '2250',
+                                      'Name' => 'struct _IO_FILE*',
+                                      'Size' => '8',
+                                      'Type' => 'Pointer'
+                                    },
+                          '2709' => {
+                                      'BaseType' => '138',
+                                      'Name' => 'char[1]',
+                                      'Size' => '1',
+                                      'Type' => 'Array'
+                                    },
+                          '2725' => {
+                                      'BaseType' => '2641',
+                                      'Name' => '_IO_lock_t*',
+                                      'Size' => '8',
+                                      'Type' => 'Pointer'
+                                    },
+                          '2731' => {
+                                      'BaseType' => '138',
+                                      'Name' => 'char[20]',
+                                      'Size' => '20',
+                                      'Type' => 'Array'
+                                    },
+                          '2747' => {
+                                      'BaseType' => '87',
+                                      'Header' => 'openjpeg.h',
+                                      'Line' => '110',
+                                      'Name' => 'OPJ_BOOL',
+                                      'Size' => '4',
+                                      'Type' => 'Typedef'
+                                    },
+                          '45' => {
+                                    'Name' => 'unsigned char',
+                                    'Size' => '1',
+                                    'Type' => 'Intrinsic'
+                                  },
+                          '52' => {
+                                    'Name' => 'unsigned short',
+                                    'Size' => '2',
+                                    'Type' => 'Intrinsic'
+                                  },
+                          '58921' => {
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '691',
+                                       'Line' => '694',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'dx',
                                                             'offset' => '0',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '1' => {
                                                             'name' => 'dy',
                                                             'offset' => '4',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '2' => {
                                                             'name' => 'w',
                                                             'offset' => '8',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '3' => {
                                                             'name' => 'h',
                                                             'offset' => '12',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '4' => {
                                                             'name' => 'x0',
                                                             'offset' => '16',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '5' => {
                                                             'name' => 'y0',
                                                             'offset' => '20',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '6' => {
                                                             'name' => 'prec',
                                                             'offset' => '24',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '7' => {
                                                             'name' => 'bpp',
                                                             'offset' => '28',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '8' => {
                                                             'name' => 'sgnd',
                                                             'offset' => '32',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           }
                                                  },
                                        'Name' => 'struct opj_image_comptparm',
                                        'Size' => '36',
                                        'Type' => 'Struct'
                                      },
-                          '43279' => {
-                                       'BaseType' => '43156',
+                          '59' => {
+                                    'Name' => 'unsigned int',
+                                    'Size' => '4',
+                                    'Type' => 'Intrinsic'
+                                  },
+                          '59044' => {
+                                       'BaseType' => '58921',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '710',
+                                       'Line' => '713',
                                        'Name' => 'opj_image_cmptparm_t',
                                        'Size' => '36',
                                        'Type' => 'Typedef'
                                      },
-                          '44971' => {
-                                       'BaseType' => '43144',
-                                       'Name' => 'opj_image_t*',
+                          '61595' => {
+                                       'BaseType' => '59044',
+                                       'Name' => 'opj_image_cmptparm_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '45' => {
-                                    'BaseType' => '56',
-                                    'Header' => 'stddef.h',
-                                    'Line' => '212',
-                                    'Name' => 'size_t',
+                          '66' => {
+                                    'Name' => 'unsigned long',
                                     'Size' => '8',
-                                    'Type' => 'Typedef'
+                                    'Type' => 'Intrinsic'
                                   },
-                          '45817' => {
-                                       'BaseType' => '43279',
-                                       'Name' => 'opj_image_cmptparm_t*',
-                                       'Size' => '8',
-                                       'Type' => 'Pointer'
-                                     },
-                          '51050' => {
-                                       'BaseType' => '188',
+                          '66835' => {
+                                       'BaseType' => '2250',
                                        'Header' => 'stdio.h',
-                                       'Line' => '48',
+                                       'Line' => '49',
                                        'Name' => 'FILE',
                                        'Size' => '216',
                                        'Type' => 'Typedef'
                                      },
-                          '51760' => {
+                          '67552' => {
                                        'Header' => 'openjpeg.h',
                                        'Line' => '246',
                                        'Memb' => {
@@ -2211,15 +2295,15 @@ $VAR1 = {
                                        'Size' => '4',
                                        'Type' => 'Enum'
                                      },
-                          '51799' => {
-                                       'BaseType' => '51760',
+                          '67591' => {
+                                       'BaseType' => '67552',
                                        'Header' => 'openjpeg.h',
                                        'Line' => '251',
                                        'Name' => 'OPJ_RSIZ_CAPABILITIES',
                                        'Size' => '4',
                                        'Type' => 'Typedef'
                                      },
-                          '51810' => {
+                          '67602' => {
                                        'Header' => 'openjpeg.h',
                                        'Line' => '257',
                                        'Memb' => {
@@ -2244,1130 +2328,1046 @@ $VAR1 = {
                                        'Size' => '4',
                                        'Type' => 'Enum'
                                      },
-                          '51848' => {
-                                       'BaseType' => '51810',
+                          '67640' => {
+                                       'BaseType' => '67602',
                                        'Header' => 'openjpeg.h',
                                        'Line' => '262',
                                        'Name' => 'OPJ_CINEMA_MODE',
                                        'Size' => '4',
                                        'Type' => 'Typedef'
                                      },
-                          '52532' => {
+                          '68324' => {
                                        'Header' => 'openjpeg.h',
                                        'Line' => '353',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'tile_size_on',
                                                             'offset' => '0',
-                                                            'type' => '694'
+                                                            'type' => '2747'
                                                           },
                                                    '1' => {
                                                             'name' => 'cp_tx0',
                                                             'offset' => '4',
-                                                            'type' => '98'
+                                                            'type' => '87'
                                                           },
                                                    '10' => {
                                                              'name' => 'csty',
                                                              'offset' => '48',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '11' => {
                                                              'name' => 'prog_order',
                                                              'offset' => '52',
-                                                             'type' => '42208'
+                                                             'type' => '18396'
                                                            },
                                                    '12' => {
                                                              'name' => 'POC',
                                                              'offset' => '56',
-                                                             'type' => '42796'
+                                                             'type' => '18984'
                                                            },
                                                    '13' => {
                                                              'name' => 'numpocs',
                                                              'offset' => '4792',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '14' => {
                                                              'name' => 'tcp_numlayers',
                                                              'offset' => '4796',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '15' => {
                                                              'name' => 'tcp_rates',
                                                              'offset' => '4800',
-                                                             'type' => '53396'
+                                                             'type' => '69188'
                                                            },
                                                    '16' => {
                                                              'name' => 'tcp_distoratio',
                                                              'offset' => '5200',
-                                                             'type' => '53396'
+                                                             'type' => '69188'
                                                            },
                                                    '17' => {
                                                              'name' => 'numresolution',
                                                              'offset' => '5600',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '18' => {
                                                              'name' => 'cblockw_init',
                                                              'offset' => '5604',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '19' => {
                                                              'name' => 'cblockh_init',
                                                              'offset' => '5608',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '2' => {
                                                             'name' => 'cp_ty0',
                                                             'offset' => '8',
-                                                            'type' => '98'
+                                                            'type' => '87'
                                                           },
                                                    '20' => {
                                                              'name' => 'mode',
                                                              'offset' => '5612',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '21' => {
                                                              'name' => 'irreversible',
                                                              'offset' => '5616',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '22' => {
                                                              'name' => 'roi_compno',
                                                              'offset' => '5620',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '23' => {
                                                              'name' => 'roi_shift',
                                                              'offset' => '5624',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '24' => {
                                                              'name' => 'res_spec',
                                                              'offset' => '5628',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '25' => {
                                                              'name' => 'prcw_init',
                                                              'offset' => '5632',
-                                                             'type' => '53412'
+                                                             'type' => '69204'
                                                            },
                                                    '26' => {
                                                              'name' => 'prch_init',
                                                              'offset' => '5764',
-                                                             'type' => '53412'
+                                                             'type' => '69204'
                                                            },
                                                    '27' => {
                                                              'name' => 'infile',
                                                              'offset' => '5896',
-                                                             'type' => '53428'
+                                                             'type' => '69220'
                                                            },
                                                    '28' => {
                                                              'name' => 'outfile',
                                                              'offset' => '9992',
-                                                             'type' => '53428'
+                                                             'type' => '69220'
                                                            },
                                                    '29' => {
                                                              'name' => 'index_on',
                                                              'offset' => '14088',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '3' => {
                                                             'name' => 'cp_tdx',
                                                             'offset' => '12',
-                                                            'type' => '98'
+                                                            'type' => '87'
                                                           },
                                                    '30' => {
                                                              'name' => 'index',
                                                              'offset' => '14092',
-                                                             'type' => '53428'
+                                                             'type' => '69220'
                                                            },
                                                    '31' => {
                                                              'name' => 'image_offset_x0',
                                                              'offset' => '18188',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '32' => {
                                                              'name' => 'image_offset_y0',
                                                              'offset' => '18192',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '33' => {
                                                              'name' => 'subsampling_dx',
                                                              'offset' => '18196',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '34' => {
                                                              'name' => 'subsampling_dy',
                                                              'offset' => '18200',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '35' => {
                                                              'name' => 'decod_format',
                                                              'offset' => '18204',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '36' => {
                                                              'name' => 'cod_format',
                                                              'offset' => '18208',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '37' => {
                                                              'name' => 'jpwl_epc_on',
                                                              'offset' => '18212',
-                                                             'type' => '694'
+                                                             'type' => '2747'
                                                            },
                                                    '38' => {
                                                              'name' => 'jpwl_hprot_MH',
                                                              'offset' => '18216',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '39' => {
                                                              'name' => 'jpwl_hprot_TPH_tileno',
                                                              'offset' => '18220',
-                                                             'type' => '53445'
+                                                             'type' => '69237'
                                                            },
                                                    '4' => {
                                                             'name' => 'cp_tdy',
                                                             'offset' => '16',
-                                                            'type' => '98'
+                                                            'type' => '87'
                                                           },
                                                    '40' => {
                                                              'name' => 'jpwl_hprot_TPH',
                                                              'offset' => '18284',
-                                                             'type' => '53445'
+                                                             'type' => '69237'
                                                            },
                                                    '41' => {
                                                              'name' => 'jpwl_pprot_tileno',
                                                              'offset' => '18348',
-                                                             'type' => '53445'
+                                                             'type' => '69237'
                                                            },
                                                    '42' => {
                                                              'name' => 'jpwl_pprot_packno',
                                                              'offset' => '18412',
-                                                             'type' => '53445'
+                                                             'type' => '69237'
                                                            },
                                                    '43' => {
                                                              'name' => 'jpwl_pprot',
                                                              'offset' => '18476',
-                                                             'type' => '53445'
+                                                             'type' => '69237'
                                                            },
                                                    '44' => {
                                                              'name' => 'jpwl_sens_size',
                                                              'offset' => '18540',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '45' => {
                                                              'name' => 'jpwl_sens_addr',
                                                              'offset' => '18544',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '46' => {
                                                              'name' => 'jpwl_sens_range',
                                                              'offset' => '18548',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '47' => {
                                                              'name' => 'jpwl_sens_MH',
                                                              'offset' => '18552',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '48' => {
                                                              'name' => 'jpwl_sens_TPH_tileno',
                                                              'offset' => '18556',
-                                                             'type' => '53445'
+                                                             'type' => '69237'
                                                            },
                                                    '49' => {
                                                              'name' => 'jpwl_sens_TPH',
                                                              'offset' => '18620',
-                                                             'type' => '53445'
+                                                             'type' => '69237'
                                                            },
                                                    '5' => {
                                                             'name' => 'cp_disto_alloc',
                                                             'offset' => '20',
-                                                            'type' => '98'
+                                                            'type' => '87'
                                                           },
                                                    '50' => {
                                                              'name' => 'cp_cinema',
                                                              'offset' => '18684',
-                                                             'type' => '51848'
+                                                             'type' => '67640'
                                                            },
                                                    '51' => {
                                                              'name' => 'max_comp_size',
                                                              'offset' => '18688',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '52' => {
                                                              'name' => 'cp_rsiz',
                                                              'offset' => '18692',
-                                                             'type' => '51799'
+                                                             'type' => '67591'
                                                            },
                                                    '53' => {
                                                              'name' => 'tp_on',
                                                              'offset' => '18696',
-                                                             'type' => '149'
+                                                             'type' => '138'
                                                            },
                                                    '54' => {
                                                              'name' => 'tp_flag',
                                                              'offset' => '18697',
-                                                             'type' => '149'
+                                                             'type' => '138'
                                                            },
                                                    '55' => {
                                                              'name' => 'tcp_mct',
                                                              'offset' => '18698',
-                                                             'type' => '149'
+                                                             'type' => '138'
                                                            },
                                                    '56' => {
                                                              'name' => 'jpip_on',
                                                              'offset' => '18700',
-                                                             'type' => '694'
+                                                             'type' => '2747'
                                                            },
                                                    '57' => {
                                                              'name' => 'mct_data',
                                                              'offset' => '18704',
-                                                             'type' => '141'
+                                                             'type' => '130'
                                                            },
                                                    '58' => {
                                                              'name' => 'max_cs_size',
                                                              'offset' => '18712',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '59' => {
                                                              'name' => 'rsiz',
                                                              'offset' => '18716',
-                                                             'type' => '42103'
+                                                             'type' => '18280'
                                                            },
                                                    '6' => {
                                                             'name' => 'cp_fixed_alloc',
                                                             'offset' => '24',
-                                                            'type' => '98'
+                                                            'type' => '87'
                                                           },
                                                    '7' => {
                                                             'name' => 'cp_fixed_quality',
                                                             'offset' => '28',
-                                                            'type' => '98'
+                                                            'type' => '87'
                                                           },
                                                    '8' => {
                                                             'name' => 'cp_matrice',
                                                             'offset' => '32',
-                                                            'type' => '53374'
+                                                            'type' => '69166'
                                                           },
                                                    '9' => {
                                                             'name' => 'cp_comment',
                                                             'offset' => '40',
-                                                            'type' => '143'
+                                                            'type' => '132'
                                                           }
                                                  },
                                        'Name' => 'struct opj_cparameters',
                                        'Size' => '18720',
                                        'Type' => 'Struct'
                                      },
-                          '53374' => {
-                                       'BaseType' => '98',
+                          '69166' => {
+                                       'BaseType' => '87',
                                        'Name' => 'int*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '53396' => {
-                                       'BaseType' => '163',
+                          '69188' => {
+                                       'BaseType' => '2236',
                                        'Name' => 'float[100]',
                                        'Size' => '400',
                                        'Type' => 'Array'
                                      },
-                          '53412' => {
-                                       'BaseType' => '98',
+                          '69204' => {
+                                       'BaseType' => '87',
                                        'Name' => 'int[33]',
                                        'Size' => '132',
                                        'Type' => 'Array'
                                      },
-                          '53428' => {
-                                       'BaseType' => '149',
+                          '69220' => {
+                                       'BaseType' => '138',
                                        'Name' => 'char[4096]',
                                        'Size' => '4096',
                                        'Type' => 'Array'
                                      },
-                          '53445' => {
-                                       'BaseType' => '98',
+                          '69237' => {
+                                       'BaseType' => '87',
                                        'Name' => 'int[16]',
                                        'Size' => '64',
                                        'Type' => 'Array'
                                      },
-                          '53461' => {
-                                       'BaseType' => '52532',
+                          '69253' => {
+                                       'BaseType' => '68324',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '501',
+                                       'Line' => '504',
                                        'Name' => 'opj_cparameters_t',
                                        'Size' => '18720',
                                        'Type' => 'Typedef'
                                      },
-                          '53473' => {
+                          '69265' => {
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '509',
+                                       'Line' => '512',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'cp_reduce',
                                                             'offset' => '0',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '1' => {
                                                             'name' => 'cp_layer',
                                                             'offset' => '4',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '10' => {
                                                              'name' => 'm_verbose',
                                                              'offset' => '8224',
-                                                             'type' => '694'
+                                                             'type' => '2747'
                                                            },
                                                    '11' => {
                                                              'name' => 'tile_index',
                                                              'offset' => '8228',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '12' => {
                                                              'name' => 'nb_tile_to_decode',
                                                              'offset' => '8232',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '13' => {
                                                              'name' => 'jpwl_correct',
                                                              'offset' => '8236',
-                                                             'type' => '694'
+                                                             'type' => '2747'
                                                            },
                                                    '14' => {
                                                              'name' => 'jpwl_exp_comps',
                                                              'offset' => '8240',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '15' => {
                                                              'name' => 'jpwl_max_tiles',
                                                              'offset' => '8244',
-                                                             'type' => '98'
+                                                             'type' => '87'
                                                            },
                                                    '16' => {
                                                              'name' => 'flags',
                                                              'offset' => '8248',
-                                                             'type' => '77'
+                                                             'type' => '59'
                                                            },
                                                    '2' => {
                                                             'name' => 'infile',
                                                             'offset' => '8',
-                                                            'type' => '53428'
+                                                            'type' => '69220'
                                                           },
                                                    '3' => {
                                                             'name' => 'outfile',
                                                             'offset' => '4104',
-                                                            'type' => '53428'
+                                                            'type' => '69220'
                                                           },
                                                    '4' => {
                                                             'name' => 'decod_format',
                                                             'offset' => '8200',
-                                                            'type' => '98'
+                                                            'type' => '87'
                                                           },
                                                    '5' => {
                                                             'name' => 'cod_format',
                                                             'offset' => '8204',
-                                                            'type' => '98'
+                                                            'type' => '87'
                                                           },
                                                    '6' => {
                                                             'name' => 'DA_x0',
                                                             'offset' => '8208',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '7' => {
                                                             'name' => 'DA_x1',
                                                             'offset' => '8212',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '8' => {
                                                             'name' => 'DA_y0',
                                                             'offset' => '8216',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '9' => {
                                                             'name' => 'DA_y1',
                                                             'offset' => '8220',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           }
                                                  },
                                        'Name' => 'struct opj_dparameters',
                                        'Size' => '8252',
                                        'Type' => 'Struct'
                                      },
-                          '53723' => {
-                                       'BaseType' => '53473',
+                          '69515' => {
+                                       'BaseType' => '69265',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '569',
+                                       'Line' => '572',
                                        'Name' => 'opj_dparameters_t',
                                        'Size' => '8252',
                                        'Type' => 'Typedef'
                                      },
-                          '54239' => {
+                          '70031' => {
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '723',
+                                       'Line' => '726',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'start_pos',
                                                             'offset' => '0',
-                                                            'type' => '11195'
+                                                            'type' => '11199'
                                                           },
                                                    '1' => {
                                                             'name' => 'end_ph_pos',
                                                             'offset' => '8',
-                                                            'type' => '11195'
+                                                            'type' => '11199'
                                                           },
                                                    '2' => {
                                                             'name' => 'end_pos',
                                                             'offset' => '16',
-                                                            'type' => '11195'
+                                                            'type' => '11199'
                                                           },
                                                    '3' => {
                                                             'name' => 'disto',
                                                             'offset' => '24',
-                                                            'type' => '170'
+                                                            'type' => '2243'
                                                           }
                                                  },
                                        'Name' => 'struct opj_packet_info',
                                        'Size' => '32',
                                        'Type' => 'Struct'
                                      },
-                          '54305' => {
-                                       'BaseType' => '54239',
+                          '70097' => {
+                                       'BaseType' => '70031',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '732',
+                                       'Line' => '735',
                                        'Name' => 'opj_packet_info_t',
                                        'Size' => '32',
                                        'Type' => 'Typedef'
                                      },
-                          '54317' => {
+                          '70109' => {
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '739',
+                                       'Line' => '742',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'type',
                                                             'offset' => '0',
-                                                            'type' => '70'
+                                                            'type' => '52'
                                                           },
                                                    '1' => {
                                                             'name' => 'pos',
                                                             'offset' => '8',
-                                                            'type' => '11195'
+                                                            'type' => '11199'
                                                           },
                                                    '2' => {
                                                             'name' => 'len',
                                                             'offset' => '16',
-                                                            'type' => '98'
+                                                            'type' => '87'
                                                           }
                                                  },
                                        'Name' => 'struct opj_marker_info',
                                        'Size' => '24',
                                        'Type' => 'Struct'
                                      },
-                          '54370' => {
-                                       'BaseType' => '54317',
+                          '70162' => {
+                                       'BaseType' => '70109',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '746',
+                                       'Line' => '749',
                                        'Name' => 'opj_marker_info_t',
                                        'Size' => '24',
                                        'Type' => 'Typedef'
                                      },
-                          '54722' => {
-                                       'BaseType' => '54305',
+                          '70514' => {
+                                       'BaseType' => '70097',
                                        'Name' => 'opj_packet_info_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '54728' => {
-                                       'BaseType' => '54370',
+                          '70520' => {
+                                       'BaseType' => '70162',
                                        'Name' => 'opj_marker_info_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '55068' => {
+                          '70860' => {
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '863',
+                                       'Line' => '866',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'compno',
                                                             'offset' => '0',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '1' => {
                                                             'name' => 'csty',
                                                             'offset' => '4',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '10' => {
                                                              'name' => 'numgbits',
                                                              'offset' => '808',
-                                                             'type' => '9018'
+                                                             'type' => '9015'
                                                            },
                                                    '11' => {
                                                              'name' => 'roishift',
                                                              'offset' => '812',
-                                                             'type' => '9007'
+                                                             'type' => '9004'
                                                            },
                                                    '12' => {
                                                              'name' => 'prcw',
                                                              'offset' => '816',
-                                                             'type' => '18281'
+                                                             'type' => '19344'
                                                            },
                                                    '13' => {
                                                              'name' => 'prch',
                                                              'offset' => '948',
-                                                             'type' => '18281'
+                                                             'type' => '19344'
                                                            },
                                                    '2' => {
                                                             'name' => 'numresolutions',
                                                             'offset' => '8',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '3' => {
                                                             'name' => 'cblkw',
                                                             'offset' => '12',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '4' => {
                                                             'name' => 'cblkh',
                                                             'offset' => '16',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '5' => {
                                                             'name' => 'cblksty',
                                                             'offset' => '20',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '6' => {
                                                             'name' => 'qmfbid',
                                                             'offset' => '24',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '7' => {
                                                             'name' => 'qntsty',
                                                             'offset' => '28',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '8' => {
                                                             'name' => 'stepsizes_mant',
                                                             'offset' => '32',
-                                                            'type' => '55270'
+                                                            'type' => '71062'
                                                           },
                                                    '9' => {
                                                             'name' => 'stepsizes_expn',
                                                             'offset' => '420',
-                                                            'type' => '55270'
+                                                            'type' => '71062'
                                                           }
                                                  },
                                        'Name' => 'struct opj_tccp_info',
                                        'Size' => '1080',
                                        'Type' => 'Struct'
                                      },
-                          '55270' => {
-                                       'BaseType' => '9018',
+                          '71062' => {
+                                       'BaseType' => '9015',
                                        'Name' => 'OPJ_UINT32[97]',
                                        'Size' => '388',
                                        'Type' => 'Array'
                                      },
-                          '55302' => {
-                                       'BaseType' => '55068',
+                          '71094' => {
+                                       'BaseType' => '70860',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '893',
+                                       'Line' => '896',
                                        'Name' => 'opj_tccp_info_t',
                                        'Size' => '1080',
                                        'Type' => 'Typedef'
                                      },
-                          '55314' => {
+                          '71106' => {
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '898',
+                                       'Line' => '901',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'tileno',
                                                             'offset' => '0',
-                                                            'type' => '98'
+                                                            'type' => '87'
                                                           },
                                                    '1' => {
                                                             'name' => 'csty',
                                                             'offset' => '4',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '2' => {
                                                             'name' => 'prg',
                                                             'offset' => '8',
-                                                            'type' => '42208'
+                                                            'type' => '18396'
                                                           },
                                                    '3' => {
                                                             'name' => 'numlayers',
                                                             'offset' => '12',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '4' => {
                                                             'name' => 'mct',
                                                             'offset' => '16',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '5' => {
                                                             'name' => 'tccp_info',
                                                             'offset' => '24',
-                                                            'type' => '55406'
+                                                            'type' => '71198'
                                                           }
                                                  },
                                        'Name' => 'struct opj_tile_v2_info',
                                        'Size' => '32',
                                        'Type' => 'Struct'
                                      },
-                          '55406' => {
-                                       'BaseType' => '55302',
+                          '71198' => {
+                                       'BaseType' => '71094',
                                        'Name' => 'opj_tccp_info_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '55412' => {
-                                       'BaseType' => '55314',
+                          '71204' => {
+                                       'BaseType' => '71106',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '914',
+                                       'Line' => '917',
                                        'Name' => 'opj_tile_info_v2_t',
                                        'Size' => '32',
                                        'Type' => 'Typedef'
                                      },
-                          '55424' => {
+                          '71216' => {
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '919',
+                                       'Line' => '922',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'tx0',
                                                             'offset' => '0',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '1' => {
                                                             'name' => 'ty0',
                                                             'offset' => '4',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '2' => {
                                                             'name' => 'tdx',
                                                             'offset' => '8',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '3' => {
                                                             'name' => 'tdy',
                                                             'offset' => '12',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '4' => {
                                                             'name' => 'tw',
                                                             'offset' => '16',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '5' => {
                                                             'name' => 'th',
                                                             'offset' => '20',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '6' => {
                                                             'name' => 'nbcomps',
                                                             'offset' => '24',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '7' => {
                                                             'name' => 'm_default_tile_info',
                                                             'offset' => '32',
-                                                            'type' => '55412'
+                                                            'type' => '71204'
                                                           },
                                                    '8' => {
                                                             'name' => 'tile_info',
                                                             'offset' => '64',
-                                                            'type' => '55553'
+                                                            'type' => '71345'
                                                           }
                                                  },
                                        'Name' => 'struct opj_codestream_info_v2',
                                        'Size' => '72',
                                        'Type' => 'Struct'
                                      },
-                          '55553' => {
-                                       'BaseType' => '55412',
+                          '71345' => {
+                                       'BaseType' => '71204',
                                        'Name' => 'opj_tile_info_v2_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '55559' => {
-                                       'BaseType' => '55424',
+                          '71351' => {
+                                       'BaseType' => '71216',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '943',
+                                       'Line' => '946',
                                        'Name' => 'opj_codestream_info_v2_t',
                                        'Size' => '72',
                                        'Type' => 'Typedef'
                                      },
-                          '55571' => {
+                          '71363' => {
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '949',
+                                       'Line' => '952',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'start_pos',
                                                             'offset' => '0',
-                                                            'type' => '11195'
+                                                            'type' => '11199'
                                                           },
                                                    '1' => {
                                                             'name' => 'end_header',
                                                             'offset' => '8',
-                                                            'type' => '11195'
+                                                            'type' => '11199'
                                                           },
                                                    '2' => {
                                                             'name' => 'end_pos',
                                                             'offset' => '16',
-                                                            'type' => '11195'
+                                                            'type' => '11199'
                                                           }
                                                  },
                                        'Name' => 'struct opj_tp_index',
                                        'Size' => '24',
                                        'Type' => 'Struct'
                                      },
-                          '55624' => {
-                                       'BaseType' => '55571',
+                          '71416' => {
+                                       'BaseType' => '71363',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '957',
+                                       'Line' => '960',
                                        'Name' => 'opj_tp_index_t',
                                        'Size' => '24',
                                        'Type' => 'Typedef'
                                      },
-                          '55636' => {
+                          '71428' => {
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '962',
+                                       'Line' => '965',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'tileno',
                                                             'offset' => '0',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '1' => {
                                                             'name' => 'nb_tps',
                                                             'offset' => '4',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '2' => {
                                                             'name' => 'current_nb_tps',
                                                             'offset' => '8',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '3' => {
                                                             'name' => 'current_tpsno',
                                                             'offset' => '12',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '4' => {
                                                             'name' => 'tp_index',
                                                             'offset' => '16',
-                                                            'type' => '55780'
+                                                            'type' => '71572'
                                                           },
                                                    '5' => {
                                                             'name' => 'marknum',
                                                             'offset' => '24',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '6' => {
                                                             'name' => 'marker',
                                                             'offset' => '32',
-                                                            'type' => '54728'
+                                                            'type' => '70520'
                                                           },
                                                    '7' => {
                                                             'name' => 'maxmarknum',
                                                             'offset' => '40',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '8' => {
                                                             'name' => 'nb_packet',
                                                             'offset' => '44',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '9' => {
                                                             'name' => 'packet_index',
                                                             'offset' => '48',
-                                                            'type' => '54722'
+                                                            'type' => '70514'
                                                           }
                                                  },
                                        'Name' => 'struct opj_tile_index',
                                        'Size' => '56',
                                        'Type' => 'Struct'
                                      },
-                          '55780' => {
-                                       'BaseType' => '55624',
+                          '71572' => {
+                                       'BaseType' => '71416',
                                        'Name' => 'opj_tp_index_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '55786' => {
-                                       'BaseType' => '55636',
+                          '71578' => {
+                                       'BaseType' => '71428',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '989',
+                                       'Line' => '992',
                                        'Name' => 'opj_tile_index_t',
                                        'Size' => '56',
                                        'Type' => 'Typedef'
                                      },
-                          '55798' => {
+                          '71590' => {
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '994',
+                                       'Line' => '997',
                                        'Memb' => {
                                                    '0' => {
                                                             'name' => 'main_head_start',
                                                             'offset' => '0',
-                                                            'type' => '11195'
+                                                            'type' => '11199'
                                                           },
                                                    '1' => {
                                                             'name' => 'main_head_end',
                                                             'offset' => '8',
-                                                            'type' => '11195'
+                                                            'type' => '11199'
                                                           },
                                                    '2' => {
                                                             'name' => 'codestream_size',
                                                             'offset' => '16',
-                                                            'type' => '11184'
+                                                            'type' => '11188'
                                                           },
                                                    '3' => {
                                                             'name' => 'marknum',
                                                             'offset' => '24',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '4' => {
                                                             'name' => 'marker',
                                                             'offset' => '32',
-                                                            'type' => '54728'
+                                                            'type' => '70520'
                                                           },
                                                    '5' => {
                                                             'name' => 'maxmarknum',
                                                             'offset' => '40',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '6' => {
                                                             'name' => 'nb_of_tiles',
                                                             'offset' => '44',
-                                                            'type' => '9018'
+                                                            'type' => '9015'
                                                           },
                                                    '7' => {
                                                             'name' => 'tile_index',
                                                             'offset' => '48',
-                                                            'type' => '55916'
+                                                            'type' => '71708'
                                                           }
                                                  },
                                        'Name' => 'struct opj_codestream_index',
                                        'Size' => '56',
                                        'Type' => 'Struct'
                                      },
-                          '55916' => {
-                                       'BaseType' => '55786',
+                          '71708' => {
+                                       'BaseType' => '71578',
                                        'Name' => 'opj_tile_index_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '55922' => {
-                                       'BaseType' => '55798',
+                          '71714' => {
+                                       'BaseType' => '71590',
                                        'Header' => 'openjpeg.h',
-                                       'Line' => '1017',
+                                       'Line' => '1020',
                                        'Name' => 'opj_codestream_index_t',
                                        'Size' => '56',
                                        'Type' => 'Typedef'
                                      },
-                          '56' => {
-                                    'Name' => 'unsigned long',
-                                    'Size' => '8',
+                          '73' => {
+                                    'Name' => 'signed char',
+                                    'Size' => '1',
                                     'Type' => 'Intrinsic'
                                   },
-                          '588' => {
-                                     'Header' => 'libio.h',
-                                     'Line' => '154',
-                                     'Name' => '_IO_lock_t',
-                                     'Type' => 'Typedef'
-                                   },
-                          '58865' => {
-                                       'BaseType' => '55922',
+                          '74658' => {
+                                       'BaseType' => '71714',
                                        'Name' => 'opj_codestream_index_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '595' => {
-                                     'Header' => 'libio.h',
-                                     'Line' => '160',
-                                     'Memb' => {
-                                                 '0' => {
-                                                          'name' => '_next',
-                                                          'offset' => '0',
-                                                          'type' => '644'
-                                                        },
-                                                 '1' => {
-                                                          'name' => '_sbuf',
-                                                          'offset' => '8',
-                                                          'type' => '650'
-                                                        },
-                                                 '2' => {
-                                                          'name' => '_pos',
-                                                          'offset' => '16',
-                                                          'type' => '98'
-                                                        }
-                                               },
-                                     'Name' => 'struct _IO_marker',
-                                     'PrivateABI' => 1,
-                                     'Size' => '24',
-                                     'Type' => 'Struct'
-                                   },
-                          '60839' => {
-                                       'BaseType' => '44971',
+                          '76826' => {
+                                       'BaseType' => '21108',
                                        'Name' => 'opj_image_t**',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '60845' => {
-                                       'BaseType' => '694',
+                          '76832' => {
+                                       'BaseType' => '2747',
                                        'Name' => 'OPJ_BOOL*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '60851' => {
-                                       'BaseType' => '53723',
+                          '76838' => {
+                                       'BaseType' => '69515',
                                        'Name' => 'opj_dparameters_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '60863' => {
-                                       'BaseType' => '53461',
+                          '76850' => {
+                                       'BaseType' => '69253',
                                        'Name' => 'opj_cparameters_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '60869' => {
-                                       'BaseType' => '51050',
+                          '76856' => {
+                                       'BaseType' => '66835',
                                        'Name' => 'FILE*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '60875' => {
-                                       'BaseType' => '55559',
+                          '76862' => {
+                                       'BaseType' => '71351',
                                        'Name' => 'opj_codestream_info_v2_t*',
                                        'Size' => '8',
                                        'Type' => 'Pointer'
                                      },
-                          '63' => {
-                                    'Name' => 'unsigned char',
-                                    'Size' => '1',
-                                    'Type' => 'Intrinsic'
-                                  },
-                          '644' => {
-                                     'BaseType' => '595',
-                                     'Name' => 'struct _IO_marker*',
-                                     'Size' => '8',
-                                     'Type' => 'Pointer'
-                                   },
-                          '650' => {
-                                     'BaseType' => '188',
-                                     'Name' => 'struct _IO_FILE*',
-                                     'Size' => '8',
-                                     'Type' => 'Pointer'
-                                   },
-                          '656' => {
-                                     'BaseType' => '149',
-                                     'Name' => 'char[1]',
-                                     'Size' => '1',
-                                     'Type' => 'Array'
-                                   },
-                          '672' => {
-                                     'BaseType' => '588',
-                                     'Name' => '_IO_lock_t*',
-                                     'Size' => '8',
-                                     'Type' => 'Pointer'
-                                   },
-                          '678' => {
-                                     'BaseType' => '149',
-                                     'Name' => 'char[20]',
-                                     'Size' => '20',
-                                     'Type' => 'Array'
-                                   },
-                          '694' => {
-                                     'BaseType' => '98',
-                                     'Header' => 'openjpeg.h',
-                                     'Line' => '110',
-                                     'Name' => 'OPJ_BOOL',
-                                     'Size' => '4',
-                                     'Type' => 'Typedef'
-                                   },
-                          '70' => {
-                                    'Name' => 'unsigned short',
-                                    'Size' => '2',
-                                    'Type' => 'Intrinsic'
-                                  },
-                          '705' => {
+                          '781' => {
                                      'Name' => 'void(*)(void*)',
                                      'Param' => {
                                                   '0' => {
-                                                           'type' => '141'
+                                                           'type' => '130'
                                                          }
                                                 },
                                      'Return' => '1',
                                      'Size' => '8',
                                      'Type' => 'FuncPtr'
                                    },
-                          '77' => {
-                                    'Name' => 'unsigned int',
+                          '87' => {
+                                    'Name' => 'int',
                                     'Size' => '4',
                                     'Type' => 'Intrinsic'
                                   },
-                          '84' => {
-                                    'Name' => 'signed char',
-                                    'Size' => '1',
-                                    'Type' => 'Intrinsic'
-                                  },
-                          '8974' => {
-                                      'BaseType' => '63',
+                          '8971' => {
+                                      'BaseType' => '45',
                                       'Header' => 'openjpeg.h',
                                       'Line' => '117',
                                       'Name' => 'OPJ_BYTE',
                                       'Size' => '1',
                                       'Type' => 'Typedef'
                                     },
-                          '8985' => {
-                                      'BaseType' => '98',
+                          '8982' => {
+                                      'BaseType' => '87',
                                       'Header' => 'stdint.h',
-                                      'Line' => '38',
+                                      'Line' => '39',
                                       'Name' => 'int32_t',
                                       'Size' => '4',
                                       'Type' => 'Typedef'
                                     },
-                          '8996' => {
-                                      'BaseType' => '77',
+                          '8993' => {
+                                      'BaseType' => '59',
                                       'Header' => 'stdint.h',
-                                      'Line' => '51',
+                                      'Line' => '52',
                                       'Name' => 'uint32_t',
                                       'Size' => '4',
                                       'Type' => 'Typedef'
                                     },
-                          '9007' => {
-                                      'BaseType' => '8985',
+                          '9004' => {
+                                      'BaseType' => '8982',
                                       'Header' => 'openjpeg.h',
                                       'Line' => '125',
                                       'Name' => 'OPJ_INT32',
                                       'Size' => '4',
                                       'Type' => 'Typedef'
                                     },
-                          '9018' => {
-                                      'BaseType' => '8996',
+                          '9015' => {
+                                      'BaseType' => '8993',
                                       'Header' => 'openjpeg.h',
                                       'Line' => '126',
                                       'Name' => 'OPJ_UINT32',
                                       'Size' => '4',
                                       'Type' => 'Typedef'
                                     },
-                          '9029' => {
-                                      'BaseType' => '45',
+                          '9026' => {
+                                      'BaseType' => '145',
                                       'Header' => 'openjpeg.h',
                                       'Line' => '133',
                                       'Name' => 'OPJ_SIZE_T',
                                       'Size' => '8',
                                       'Type' => 'Typedef'
                                     },
-                          '9040' => {
-                                      'BaseType' => '8974',
+                          '9037' => {
+                                      'BaseType' => '8971',
                                       'Name' => 'OPJ_BYTE*',
                                       'Size' => '8',
                                       'Type' => 'Pointer'
                                     },
-                          '98' => {
-                                    'Name' => 'int',
-                                    'Size' => '4',
+                          '94' => {
+                                    'Name' => 'long',
+                                    'Size' => '8',
                                     'Type' => 'Intrinsic'
                                   }
                         },
@@ -3397,7 +3397,6 @@ $VAR1 = {
                                                              'fwrite@GLIBC_2.2.5' => 0,
                                                              'getenv@GLIBC_2.2.5' => 0,
                                                              'getrusage@GLIBC_2.2.5' => 0,
-                                                             'lrintf@GLIBC_2.2.5' => 0,
                                                              'malloc@GLIBC_2.2.5' => 0,
                                                              'memcpy@GLIBC_2.14' => 0,
                                                              'memset@GLIBC_2.2.5' => 0,