abi-check/headers_diff/openjpeg/2.0.1/2.1/diff.html

   1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   2     <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   3     <head>
   4     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   5     <meta name="keywords" content="OpenJPEG, header, diff" />
   6     <meta name="description" content="Diff for header files between 2.0.1 and 2.1 versions of openjpeg" />
   7     <link rel="stylesheet" type="text/css" href="../../../../css/common.css" />
   8     <link rel="stylesheet" type="text/css" href="../../../../css/headers_diff.css" />
   9
  10
  11     <title>
  12         OpenJPEG: headers diff between 2.0.1 and 2.1 versions
  13     </title>
  14
  15     </head>
  16
  17 <body>
  18 <table width='100%' cellpadding='0' cellspacing='0'><tr><td><table cellpadding='0' cellspacing='0'><tr><td align='center'><h1 class='tool'><a title='Home: ABI tracker for OpenJPEG' href='../../../../timeline/openjpeg/index.html' class='tool'>ABI<br/>Tracker</a></h1></td><td width='30px;'></td><td><h1>(OpenJPEG)</h1></td></tr></table><hr/>
  19 <br/>
  20 <br/>
  21 <h1>Headers diff: <span class='version'>2.0.1</span> vs <span class='version'>2.1</span></h1><br/><br/>
  22   <table class='diff_tbl' border="0" cellpadding="0" cellspacing="0">
  23   <tr bgcolor="orange"><th></th><th>&nbsp;openjpeg.h (2.0.1)&nbsp;</th><th> </th><th>&nbsp;openjpeg.h (2.1)&nbsp;</th><th></th></tr>
  24       <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
  25       <tr bgcolor="gray" ><td></td><th><a name="part-l1" /><small>skipping to change at</small><em> line 175</em></th><th> </th><th><a name="part-r1" /><small>skipping to change at</small><em> line 175</em></th><td></td></tr>
  26       <tr><td class="lineno" valign="top"></td><td class="left">#define OPJ_IMG_INFO           1       /**&lt; Basic image information provide
  27 d to the user */</td><td> </td><td class="right">#define OPJ_IMG_INFO           1       /**&lt; Basic image information provide
  28 d to the user */</td><td class="lineno" valign="top"></td></tr>
  29       <tr><td class="lineno" valign="top"></td><td class="left">#define OPJ_J2K_MH_INFO                2       /**&lt; Codestream information
  30 based only on the main header */</td><td> </td><td class="right">#define OPJ_J2K_MH_INFO                2       /**&lt; Codestream information
  31 based only on the main header */</td><td class="lineno" valign="top"></td></tr>
  32       <tr><td class="lineno" valign="top"></td><td class="left">#define OPJ_J2K_TH_INFO                4       /**&lt; Tile information based
  33 on the current tile header */</td><td> </td><td class="right">#define OPJ_J2K_TH_INFO                4       /**&lt; Tile information based
  34 on the current tile header */</td><td class="lineno" valign="top"></td></tr>
  35       <tr><td class="lineno" valign="top"></td><td class="left">#define OPJ_J2K_TCH_INFO       8       /**&lt; Tile/Component information of a
  36 ll tiles */</td><td> </td><td class="right">#define OPJ_J2K_TCH_INFO       8       /**&lt; Tile/Component information of a
  37 ll tiles */</td><td class="lineno" valign="top"></td></tr>
  38       <tr><td class="lineno" valign="top"></td><td class="left">#define OPJ_J2K_MH_IND         16      /**&lt; Codestream index based only on
  39 the main header */</td><td> </td><td class="right">#define OPJ_J2K_MH_IND         16      /**&lt; Codestream index based only on
  40 the main header */</td><td class="lineno" valign="top"></td></tr>
  41       <tr><td class="lineno" valign="top"></td><td class="left">#define OPJ_J2K_TH_IND         32      /**&lt; Tile index based on the current
  42  tile */</td><td> </td><td class="right">#define OPJ_J2K_TH_IND         32      /**&lt; Tile index based on the current
  43  tile */</td><td class="lineno" valign="top"></td></tr>
  44       <tr><td class="lineno" valign="top"></td><td class="left">/*FIXME #define OPJ_J2K_CSTR_IND       48*/    /**&lt;  */</td><td> </td><td class="right">/*FIXME #define OPJ_J2K_CSTR_IND       48*/    /**&lt;  */</td><td class="lineno" valign="top"></td></tr>
  45       <tr><td class="lineno" valign="top"></td><td class="left">#define OPJ_JP2_INFO           128     /**&lt; JP2 file information */</td><td> </td><td class="right">#define OPJ_JP2_INFO           128     /**&lt; JP2 file information */</td><td class="lineno" valign="top"></td></tr>
  46       <tr><td class="lineno" valign="top"></td><td class="left">#define OPJ_JP2_IND                    256     /**&lt; JP2 file index */</td><td> </td><td class="right">#define OPJ_JP2_IND                    256     /**&lt; JP2 file index */</td><td class="lineno" valign="top"></td></tr>
  47       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
  48       <tr><td><a name="diff0001" /></td></tr>
  49       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">/**</span></td><td class="lineno" valign="top"></td></tr>
  50       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * JPEG 2000 Profiles, see Table A.10 from 15444-1 (updated in various AMD)</span></td><td class="lineno" valign="top"></td></tr>
  51       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * These values help chosing the RSIZ value for the J2K codestream.</span></td><td class="lineno" valign="top"></td></tr>
  52       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * The RSIZ value triggers various encoding options, as detailed in Table A</span></td><td class="lineno" valign="top"></td></tr>
  53       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">.10.</span></td><td class="lineno" valign="top"></td></tr>
  54       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * If OPJ_PROFILE_PART2 is chosen, it has to be combined with one or more e</span></td><td class="lineno" valign="top"></td></tr>
  55       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">xtensions</span></td><td class="lineno" valign="top"></td></tr>
  56       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * described hereunder.</span></td><td class="lineno" valign="top"></td></tr>
  57       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> *   Example: rsiz = OPJ_PROFILE_PART2 | OPJ_EXTENSION_MCT;</span></td><td class="lineno" valign="top"></td></tr>
  58       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * For broadcast profiles, the OPJ_PROFILE value has to be combined with th</span></td><td class="lineno" valign="top"></td></tr>
  59       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">e targeted</span></td><td class="lineno" valign="top"></td></tr>
  60       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * mainlevel (3-0 LSB, value between 0 and 11):</span></td><td class="lineno" valign="top"></td></tr>
  61       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> *   Example: rsiz = OPJ_PROFILE_BC_MULTI | 0x0005; (here mainlevel 5)</span></td><td class="lineno" valign="top"></td></tr>
  62       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * For IMF profiles, the OPJ_PROFILE value has to be combined with the targ</span></td><td class="lineno" valign="top"></td></tr>
  63       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">eted mainlevel</span></td><td class="lineno" valign="top"></td></tr>
  64       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * (3-0 LSB, value between 0 and 11) and sublevel (7-4 LSB, value between 0</span></td><td class="lineno" valign="top"></td></tr>
  65       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> and 9):</span></td><td class="lineno" valign="top"></td></tr>
  66       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> *   Example: rsiz = OPJ_PROFILE_IMF_2K | 0x0040 | 0x0005; (here main 5 and</span></td><td class="lineno" valign="top"></td></tr>
  67       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> sublevel 4)</span></td><td class="lineno" valign="top"></td></tr>
  68       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * */</span></td><td class="lineno" valign="top"></td></tr>
  69       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_PROFILE_NONE        0x0000 /** no profile, conform to 15444-1 *</span></td><td class="lineno" valign="top"></td></tr>
  70       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">/</span></td><td class="lineno" valign="top"></td></tr>
  71       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_PROFILE_0           0x0001 /** Profile 0 as described in 15444-</span></td><td class="lineno" valign="top"></td></tr>
  72       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">1,Table A.45 */</span></td><td class="lineno" valign="top"></td></tr>
  73       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_PROFILE_1           0x0002 /** Profile 1 as described in 15444-</span></td><td class="lineno" valign="top"></td></tr>
  74       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">1,Table A.45 */</span></td><td class="lineno" valign="top"></td></tr>
  75       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_PROFILE_PART2       0x8000 /** At least 1 extension defined in </span></td><td class="lineno" valign="top"></td></tr>
  76       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">15444-2 (Part-2) */</span></td><td class="lineno" valign="top"></td></tr>
  77       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_PROFILE_CINEMA_2K   0x0003 /** 2K cinema profile defined in 154</span></td><td class="lineno" valign="top"></td></tr>
  78       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">44-1 AMD1 */</span></td><td class="lineno" valign="top"></td></tr>
  79       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_PROFILE_CINEMA_4K   0x0004 /** 4K cinema profile defined in 154</span></td><td class="lineno" valign="top"></td></tr>
  80       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">44-1 AMD1 */</span></td><td class="lineno" valign="top"></td></tr>
  81       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_PROFILE_CINEMA_S2K  0x0005 /** Scalable 2K cinema profile defin</span></td><td class="lineno" valign="top"></td></tr>
  82       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">ed in 15444-1 AMD2 */</span></td><td class="lineno" valign="top"></td></tr>
  83       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_PROFILE_CINEMA_S4K  0x0006 /** Scalable 4K cinema profile defin</span></td><td class="lineno" valign="top"></td></tr>
  84       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">ed in 15444-1 AMD2 */</span></td><td class="lineno" valign="top"></td></tr>
  85       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_PROFILE_CINEMA_LTS  0x0007 /** Long term storage cinema profile</span></td><td class="lineno" valign="top"></td></tr>
  86       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> defined in 15444-1 AMD2 */</span></td><td class="lineno" valign="top"></td></tr>
  87       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_PROFILE_BC_SINGLE   0x0100 /** Single Tile Broadcast profile de</span></td><td class="lineno" valign="top"></td></tr>
  88       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">fined in 15444-1 AMD3 */</span></td><td class="lineno" valign="top"></td></tr>
  89       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_PROFILE_BC_MULTI    0x0200 /** Multi Tile Broadcast profile def</span></td><td class="lineno" valign="top"></td></tr>
  90       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">ined in 15444-1 AMD3 */</span></td><td class="lineno" valign="top"></td></tr>
  91       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_PROFILE_BC_MULTI_R  0x0300 /** Multi Tile Reversible Broadcast </span></td><td class="lineno" valign="top"></td></tr>
  92       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">profile defined in 15444-1 AMD3 */</span></td><td class="lineno" valign="top"></td></tr>
  93       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_PROFILE_IMF_2K      0x0400 /** 2K Single Tile Lossy IMF profile</span></td><td class="lineno" valign="top"></td></tr>
  94       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> defined in 15444-1 AMD 8 */</span></td><td class="lineno" valign="top"></td></tr>
  95       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_PROFILE_IMF_4K      0x0401 /** 4K Single Tile Lossy IMF profile</span></td><td class="lineno" valign="top"></td></tr>
  96       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> defined in 15444-1 AMD 8 */</span></td><td class="lineno" valign="top"></td></tr>
  97       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_PROFILE_IMF_8K      0x0402 /** 8K Single Tile Lossy IMF profile</span></td><td class="lineno" valign="top"></td></tr>
  98       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> defined in 15444-1 AMD 8 */</span></td><td class="lineno" valign="top"></td></tr>
  99       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_PROFILE_IMF_2K_R    0x0403 /** 2K Single/Multi Tile Reversible </span></td><td class="lineno" valign="top"></td></tr>
 100       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">IMF profile defined in 15444-1 AMD 8 */</span></td><td class="lineno" valign="top"></td></tr>
 101       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_PROFILE_IMF_4K_R    0x0800 /** 4K Single/Multi Tile Reversible </span></td><td class="lineno" valign="top"></td></tr>
 102       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">IMF profile defined in 15444-1 AMD 8 */</span></td><td class="lineno" valign="top"></td></tr>
 103       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_PROFILE_IMF_8K_R    0x0801  /** 8K Single/Multi Tile Reversible</span></td><td class="lineno" valign="top"></td></tr>
 104       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> IMF profile defined in 15444-1 AMD 8 */</span></td><td class="lineno" valign="top"></td></tr>
 105       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"></span></td><td class="lineno" valign="top"></td></tr>
 106       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">/**</span></td><td class="lineno" valign="top"></td></tr>
 107       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * JPEG 2000 Part-2 extensions</span></td><td class="lineno" valign="top"></td></tr>
 108       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * */</span></td><td class="lineno" valign="top"></td></tr>
 109       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_EXTENSION_NONE      0x0000 /** No Part-2 extension */</span></td><td class="lineno" valign="top"></td></tr>
 110       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_EXTENSION_MCT       0x0100  /** Custom MCT support */</span></td><td class="lineno" valign="top"></td></tr>
 111       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"></span></td><td class="lineno" valign="top"></td></tr>
 112       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">/**</span></td><td class="lineno" valign="top"></td></tr>
 113       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * JPEG 2000 profile macros</span></td><td class="lineno" valign="top"></td></tr>
 114       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * */</span></td><td class="lineno" valign="top"></td></tr>
 115       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IS_CINEMA(v)     (((v) &gt;= OPJ_PROFILE_CINEMA_2K)&amp;&amp;((v) &lt;= OPJ_P</span></td><td class="lineno" valign="top"></td></tr>
 116       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">ROFILE_CINEMA_S4K))</span></td><td class="lineno" valign="top"></td></tr>
 117       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IS_STORAGE(v)    ((v) == OPJ_PROFILE_CINEMA_LTS)</span></td><td class="lineno" valign="top"></td></tr>
 118       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IS_BROADCAST(v)  (((v) &gt;= OPJ_PROFILE_BC_SINGLE)&amp;&amp;((v) &lt;= ((OPJ</span></td><td class="lineno" valign="top"></td></tr>
 119       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">_PROFILE_BC_MULTI_R) | (0x000b))))</span></td><td class="lineno" valign="top"></td></tr>
 120       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IS_IMF(v)        (((v) &gt;= OPJ_PROFILE_IMF_2K)&amp;&amp;((v) &lt;= ((OPJ_PR</span></td><td class="lineno" valign="top"></td></tr>
 121       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">OFILE_IMF_8K_R) | (0x009b))))</span></td><td class="lineno" valign="top"></td></tr>
 122       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IS_PART2(v)      ((v) &amp; OPJ_PROFILE_PART2)</span></td><td class="lineno" valign="top"></td></tr>
 123       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"></span></td><td class="lineno" valign="top"></td></tr>
 124       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">/**</span></td><td class="lineno" valign="top"></td></tr>
 125       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * JPEG 2000 codestream and component size limits in cinema profiles</span></td><td class="lineno" valign="top"></td></tr>
 126       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * */</span></td><td class="lineno" valign="top"></td></tr>
 127       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_CINEMA_24_CS     1302083           /** Maximum codestream lengt</span></td><td class="lineno" valign="top"></td></tr>
 128       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">h for 24fps */</span></td><td class="lineno" valign="top"></td></tr>
 129       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_CINEMA_48_CS     651041     /** Maximum codestream length for 4</span></td><td class="lineno" valign="top"></td></tr>
 130       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">8fps */</span></td><td class="lineno" valign="top"></td></tr>
 131       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_CINEMA_24_COMP   1041666    /** Maximum size per color componen</span></td><td class="lineno" valign="top"></td></tr>
 132       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">t for 2K &amp; 4K @ 24fps */</span></td><td class="lineno" valign="top"></td></tr>
 133       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_CINEMA_48_COMP   520833            /** Maximum size per color c</span></td><td class="lineno" valign="top"></td></tr>
 134       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">omponent for 2K @ 48fps */</span></td><td class="lineno" valign="top"></td></tr>
 135       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">                                                                           </td><td class="lineno" valign="top"></td></tr>
 136       <tr><td class="lineno" valign="top"></td><td class="left">/*</td><td> </td><td class="right">/*</td><td class="lineno" valign="top"></td></tr>
 137       <tr><td class="lineno" valign="top"></td><td class="left">==========================================================</td><td> </td><td class="right">==========================================================</td><td class="lineno" valign="top"></td></tr>
 138       <tr><td class="lineno" valign="top"></td><td class="left">   enum definitions</td><td> </td><td class="right">   enum definitions</td><td class="lineno" valign="top"></td></tr>
 139       <tr><td class="lineno" valign="top"></td><td class="left">==========================================================</td><td> </td><td class="right">==========================================================</td><td class="lineno" valign="top"></td></tr>
 140       <tr><td class="lineno" valign="top"></td><td class="left">*/</td><td> </td><td class="right">*/</td><td class="lineno" valign="top"></td></tr>
 141       <tr><td><a name="diff0002" /></td></tr>
 142       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">                                                                           </span></td><td class="lineno" valign="top"></td></tr>
 143       <tr><td class="lineno" valign="top"></td><td class="left">/**</td><td> </td><td class="right">/**</td><td class="lineno" valign="top"></td></tr>
 144       <tr><td><a name="diff0003" /></td></tr>
 145       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * DEPRECATED: use RSIZ, OPJ_PROFILE_* and OPJ_EXTENSION_* instead</span></td><td class="lineno" valign="top"></td></tr>
 146       <tr><td class="lineno" valign="top"></td><td class="left"> * Rsiz Capabilities</td><td> </td><td class="right"> * Rsiz Capabilities</td><td class="lineno" valign="top"></td></tr>
 147       <tr><td class="lineno" valign="top"></td><td class="left"> * */</td><td> </td><td class="right"> * */</td><td class="lineno" valign="top"></td></tr>
 148       <tr><td class="lineno" valign="top"></td><td class="left">typedef enum RSIZ_CAPABILITIES {</td><td> </td><td class="right">typedef enum RSIZ_CAPABILITIES {</td><td class="lineno" valign="top"></td></tr>
 149       <tr><td><a name="diff0004" /></td></tr>
 150       <tr><td class="lineno" valign="top"></td><td class="lblock">       OPJ_STD_RSIZ = 0,               /** Standard JPEG2000 profile*/</td><td> </td><td class="rblock">    OPJ_STD_RSIZ = 0,          /** Standard JPEG2000 profile*/</td><td class="lineno" valign="top"></td></tr>
 151       <tr><td class="lineno" valign="top"></td><td class="lblock">       OPJ_CINEMA2K = 3,               /** Profile name for a 2K image*/</td><td> </td><td class="rblock">    OPJ_CINEMA2K = 3,          /** Profile name for a 2K image*/</td><td class="lineno" valign="top"></td></tr>
 152       <tr><td class="lineno" valign="top"></td><td class="lblock">       OPJ_CINEMA4K = 4,               /** Profile name for a 4K image*/</td><td> </td><td class="rblock">    OPJ_CINEMA4K = 4,          /** Profile name for a 4K image*/</td><td class="lineno" valign="top"></td></tr>
 153       <tr><td class="lineno" valign="top"></td><td class="lblock">       OPJ_MCT = 0x8100</td><td> </td><td class="rblock">    OPJ_MCT = 0x8100</td><td class="lineno" valign="top"></td></tr>
 154       <tr><td class="lineno" valign="top"></td><td class="left">} OPJ_RSIZ_CAPABILITIES;</td><td> </td><td class="right">} OPJ_RSIZ_CAPABILITIES;</td><td class="lineno" valign="top"></td></tr>
 155       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 156       <tr><td class="lineno" valign="top"></td><td class="left">/**</td><td> </td><td class="right">/**</td><td class="lineno" valign="top"></td></tr>
 157       <tr><td><a name="diff0005" /></td></tr>
 158       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * DEPRECATED: use RSIZ, OPJ_PROFILE_* and OPJ_EXTENSION_* instead</span></td><td class="lineno" valign="top"></td></tr>
 159       <tr><td class="lineno" valign="top"></td><td class="left"> * Digital cinema operation mode</td><td> </td><td class="right"> * Digital cinema operation mode</td><td class="lineno" valign="top"></td></tr>
 160       <tr><td class="lineno" valign="top"></td><td class="left"> * */</td><td> </td><td class="right"> * */</td><td class="lineno" valign="top"></td></tr>
 161       <tr><td class="lineno" valign="top"></td><td class="left">typedef enum CINEMA_MODE {</td><td> </td><td class="right">typedef enum CINEMA_MODE {</td><td class="lineno" valign="top"></td></tr>
 162       <tr><td><a name="diff0006" /></td></tr>
 163       <tr><td class="lineno" valign="top"></td><td class="lblock">       OPJ_OFF = 0,                    /** Not Digital Cinema*/</td><td> </td><td class="rblock">    OPJ_OFF = 0,                       /** Not Digital Cinema*/</td><td class="lineno" valign="top"></td></tr>
 164       <tr><td class="lineno" valign="top"></td><td class="lblock">       OPJ_CINEMA2K_24 = 1,    /** 2K Digital Cinema at 24 fps*/</td><td> </td><td class="rblock">    OPJ_CINEMA2K_24 = 1,       /** 2K Digital Cinema at 24 fps*/</td><td class="lineno" valign="top"></td></tr>
 165       <tr><td class="lineno" valign="top"></td><td class="lblock">       OPJ_CINEMA2K_48 = 2,    /** 2K Digital Cinema at 48 fps*/</td><td> </td><td class="rblock">    OPJ_CINEMA2K_48 = 2,       /** 2K Digital Cinema at 48 fps*/</td><td class="lineno" valign="top"></td></tr>
 166       <tr><td class="lineno" valign="top"></td><td class="lblock">       OPJ_CINEMA4K_24 = 3             /** 4K Digital Cinema at 24 fps*/</td><td> </td><td class="rblock">    OPJ_CINEMA4K_24 = 3                /** 4K Digital Cinema at 24 fps*/</td><td class="lineno" valign="top"></td></tr>
 167       <tr><td class="lineno" valign="top"></td><td class="left">}OPJ_CINEMA_MODE;</td><td> </td><td class="right">}OPJ_CINEMA_MODE;</td><td class="lineno" valign="top"></td></tr>
 168       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 169       <tr><td class="lineno" valign="top"></td><td class="left">/**</td><td> </td><td class="right">/**</td><td class="lineno" valign="top"></td></tr>
 170       <tr><td class="lineno" valign="top"></td><td class="left"> * Progression order</td><td> </td><td class="right"> * Progression order</td><td class="lineno" valign="top"></td></tr>
 171       <tr><td class="lineno" valign="top"></td><td class="left"> * */</td><td> </td><td class="right"> * */</td><td class="lineno" valign="top"></td></tr>
 172       <tr><td class="lineno" valign="top"></td><td class="left">typedef enum PROG_ORDER {</td><td> </td><td class="right">typedef enum PROG_ORDER {</td><td class="lineno" valign="top"></td></tr>
 173       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_PROG_UNKNOWN = -1,  /**&lt; place-holder */</td><td> </td><td class="right">       OPJ_PROG_UNKNOWN = -1,  /**&lt; place-holder */</td><td class="lineno" valign="top"></td></tr>
 174       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_LRCP = 0,                   /**&lt; layer-resolution-component-prec
 175 inct order */</td><td> </td><td class="right">       OPJ_LRCP = 0,                   /**&lt; layer-resolution-component-prec
 176 inct order */</td><td class="lineno" valign="top"></td></tr>
 177       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_RLCP = 1,                   /**&lt; resolution-layer-component-prec
 178 inct order */</td><td> </td><td class="right">       OPJ_RLCP = 1,                   /**&lt; resolution-layer-component-prec
 179 inct order */</td><td class="lineno" valign="top"></td></tr>
 180       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_RPCL = 2,                   /**&lt; resolution-precinct-component-l
 181 ayer order */</td><td> </td><td class="right">       OPJ_RPCL = 2,                   /**&lt; resolution-precinct-component-l
 182 ayer order */</td><td class="lineno" valign="top"></td></tr>
 183       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_PCRL = 3,                   /**&lt; precinct-component-resolution-l
 184 ayer order */</td><td> </td><td class="right">       OPJ_PCRL = 3,                   /**&lt; precinct-component-resolution-l
 185 ayer order */</td><td class="lineno" valign="top"></td></tr>
 186       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_CPRL = 4                    /**&lt; component-precinct-resolution-l
 187 ayer order */</td><td> </td><td class="right">       OPJ_CPRL = 4                    /**&lt; component-precinct-resolution-l
 188 ayer order */</td><td class="lineno" valign="top"></td></tr>
 189       <tr><td class="lineno" valign="top"></td><td class="left">} OPJ_PROG_ORDER;</td><td> </td><td class="right">} OPJ_PROG_ORDER;</td><td class="lineno" valign="top"></td></tr>
 190       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 191       <tr><td class="lineno" valign="top"></td><td class="left">/**</td><td> </td><td class="right">/**</td><td class="lineno" valign="top"></td></tr>
 192       <tr><td class="lineno" valign="top"></td><td class="left"> * Supported image color spaces</td><td> </td><td class="right"> * Supported image color spaces</td><td class="lineno" valign="top"></td></tr>
 193       <tr><td class="lineno" valign="top"></td><td class="left">*/</td><td> </td><td class="right">*/</td><td class="lineno" valign="top"></td></tr>
 194       <tr><td class="lineno" valign="top"></td><td class="left">typedef enum COLOR_SPACE {</td><td> </td><td class="right">typedef enum COLOR_SPACE {</td><td class="lineno" valign="top"></td></tr>
 195       <tr><td><a name="diff0007" /></td></tr>
 196       <tr><td class="lineno" valign="top"></td><td class="lblock">       OPJ_CLRSPC_UNKNOWN = -1,        /**&lt; not supported by the library */</td><td> </td><td class="rblock">    OPJ_CLRSPC_UNKNOWN = -1,   /**&lt; not supported by the library */</td><td class="lineno" valign="top"></td></tr>
 197       <tr><td class="lineno" valign="top"></td><td class="lblock">       OPJ_CLRSPC_UNSPECIFIED = 0,     /**&lt; not specified in the codestream</td><td> </td><td class="rblock">    OPJ_CLRSPC_UNSPECIFIED = 0,        /**&lt; not specified in the codestream</td><td class="lineno" valign="top"></td></tr>
 198       <tr><td class="lineno" valign="top"></td><td class="lblock"> */</td><td> </td><td class="rblock"> */</td><td class="lineno" valign="top"></td></tr>
 199       <tr><td class="lineno" valign="top"></td><td class="lblock">       OPJ_CLRSPC_SRGB = 1,            /**&lt; sRGB */</td><td> </td><td class="rblock">    OPJ_CLRSPC_SRGB = 1,               /**&lt; sRGB */</td><td class="lineno" valign="top"></td></tr>
 200       <tr><td class="lineno" valign="top"></td><td class="lblock">       OPJ_CLRSPC_GRAY = 2,            /**&lt; grayscale */</td><td> </td><td class="rblock">    OPJ_CLRSPC_GRAY = 2,               /**&lt; grayscale */</td><td class="lineno" valign="top"></td></tr>
 201       <tr><td class="lineno" valign="top"></td><td class="lblock">       OPJ_CLRSPC_SYCC = <span class="delete">3</span>             /**&lt; YUV */</td><td> </td><td class="rblock">    OPJ_CLRSPC_SYCC = <span class="insert">3,</span>               /**&lt; YUV <span class="insert">*/</span></td><td class="lineno" valign="top"></td></tr>
 202       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">    OPJ_CLRSPC_EYCC = 4,        /**&lt; e-YCC */</span></td><td class="lineno" valign="top"></td></tr>
 203       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">    OPJ_CLRSPC_CMYK = 5         /**&lt; CMYK</span> */</td><td class="lineno" valign="top"></td></tr>
 204       <tr><td class="lineno" valign="top"></td><td class="left">} OPJ_COLOR_SPACE;</td><td> </td><td class="right">} OPJ_COLOR_SPACE;</td><td class="lineno" valign="top"></td></tr>
 205       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 206       <tr><td class="lineno" valign="top"></td><td class="left">/**</td><td> </td><td class="right">/**</td><td class="lineno" valign="top"></td></tr>
 207       <tr><td class="lineno" valign="top"></td><td class="left"> * Supported codec</td><td> </td><td class="right"> * Supported codec</td><td class="lineno" valign="top"></td></tr>
 208       <tr><td class="lineno" valign="top"></td><td class="left">*/</td><td> </td><td class="right">*/</td><td class="lineno" valign="top"></td></tr>
 209       <tr><td class="lineno" valign="top"></td><td class="left">typedef enum CODEC_FORMAT {</td><td> </td><td class="right">typedef enum CODEC_FORMAT {</td><td class="lineno" valign="top"></td></tr>
 210       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_CODEC_UNKNOWN = -1, /**&lt; place-holder */</td><td> </td><td class="right">       OPJ_CODEC_UNKNOWN = -1, /**&lt; place-holder */</td><td class="lineno" valign="top"></td></tr>
 211       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_CODEC_J2K  = 0,             /**&lt; JPEG-2000 codestream : read/wri
 212 te */</td><td> </td><td class="right">       OPJ_CODEC_J2K  = 0,             /**&lt; JPEG-2000 codestream : read/wri
 213 te */</td><td class="lineno" valign="top"></td></tr>
 214       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_CODEC_JPT  = 1,             /**&lt; JPT-stream (JPEG 2000, JPIP) :
 215 read only */</td><td> </td><td class="right">       OPJ_CODEC_JPT  = 1,             /**&lt; JPT-stream (JPEG 2000, JPIP) :
 216 read only */</td><td class="lineno" valign="top"></td></tr>
 217       <tr><td><a name="diff0008" /></td></tr>
 218       <tr><td class="lineno" valign="top"></td><td class="lblock">       OPJ_CODEC_JP2  = <span class="delete">2</span>              /**&lt; <span class="delete">JPEG-2000</span> file format : <span class="delete">read/wr</span></td><td> </td><td class="rblock">    OPJ_CODEC_JP2  = <span class="insert">2,</span>                /**&lt; <span class="insert">JP2</span> file format : <span class="insert">read/write */</span></td><td class="lineno" valign="top"></td></tr>
 219       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">ite</span> */</td><td> </td><td class="rblock"><span class="insert">    OPJ_CODEC_JPP  = 3,                /**&lt; JPP-stream (JPEG 2000, JPIP) : </span></td><td class="lineno" valign="top"></td></tr>
 220       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">to be coded */</span></td><td class="lineno" valign="top"></td></tr>
 221       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">    OPJ_CODEC_JPX  = 4         /**&lt; JPX file format (JPEG 2000 Part-2) : to</span></td><td class="lineno" valign="top"></td></tr>
 222       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> be coded</span> */</td><td class="lineno" valign="top"></td></tr>
 223       <tr><td class="lineno" valign="top"></td><td class="left">} OPJ_CODEC_FORMAT;</td><td> </td><td class="right">} OPJ_CODEC_FORMAT;</td><td class="lineno" valign="top"></td></tr>
 224       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 225       <tr><td class="lineno" valign="top"></td><td class="left">/*</td><td> </td><td class="right">/*</td><td class="lineno" valign="top"></td></tr>
 226       <tr><td class="lineno" valign="top"></td><td class="left">==========================================================</td><td> </td><td class="right">==========================================================</td><td class="lineno" valign="top"></td></tr>
 227       <tr><td class="lineno" valign="top"></td><td class="left">   event manager typedef definitions</td><td> </td><td class="right">   event manager typedef definitions</td><td class="lineno" valign="top"></td></tr>
 228       <tr><td class="lineno" valign="top"></td><td class="left">==========================================================</td><td> </td><td class="right">==========================================================</td><td class="lineno" valign="top"></td></tr>
 229       <tr><td class="lineno" valign="top"></td><td class="left">*/</td><td> </td><td class="right">*/</td><td class="lineno" valign="top"></td></tr>
 230       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 231       <tr><td class="lineno" valign="top"></td><td class="left">/**</td><td> </td><td class="right">/**</td><td class="lineno" valign="top"></td></tr>
 232       <tr><td class="lineno" valign="top"></td><td class="left"> * Callback function prototype for events</td><td> </td><td class="right"> * Callback function prototype for events</td><td class="lineno" valign="top"></td></tr>
 233       <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
 234       <tr bgcolor="gray" ><td></td><th><a name="part-l2" /><small>skipping to change at</small><em> line 315</em></th><th> </th><th><a name="part-r2" /><small>skipping to change at</small><em> line 378</em></th><td></td></tr>
 235       <tr><td class="lineno" valign="top"></td><td class="left">       /** csty : coding style */</td><td> </td><td class="right">       /** csty : coding style */</td><td class="lineno" valign="top"></td></tr>
 236       <tr><td class="lineno" valign="top"></td><td class="left">       int csty;</td><td> </td><td class="right">       int csty;</td><td class="lineno" valign="top"></td></tr>
 237       <tr><td class="lineno" valign="top"></td><td class="left">       /** progression order (default OPJ_LRCP) */</td><td> </td><td class="right">       /** progression order (default OPJ_LRCP) */</td><td class="lineno" valign="top"></td></tr>
 238       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_PROG_ORDER prog_order;</td><td> </td><td class="right">       OPJ_PROG_ORDER prog_order;</td><td class="lineno" valign="top"></td></tr>
 239       <tr><td class="lineno" valign="top"></td><td class="left">       /** progression order changes */</td><td> </td><td class="right">       /** progression order changes */</td><td class="lineno" valign="top"></td></tr>
 240       <tr><td class="lineno" valign="top"></td><td class="left">       opj_poc_t POC[32];</td><td> </td><td class="right">       opj_poc_t POC[32];</td><td class="lineno" valign="top"></td></tr>
 241       <tr><td class="lineno" valign="top"></td><td class="left">       /** number of progression order changes (POC), default to 0 */</td><td> </td><td class="right">       /** number of progression order changes (POC), default to 0 */</td><td class="lineno" valign="top"></td></tr>
 242       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_UINT32 numpocs;</td><td> </td><td class="right">       OPJ_UINT32 numpocs;</td><td class="lineno" valign="top"></td></tr>
 243       <tr><td class="lineno" valign="top"></td><td class="left">       /** number of layers */</td><td> </td><td class="right">       /** number of layers */</td><td class="lineno" valign="top"></td></tr>
 244       <tr><td class="lineno" valign="top"></td><td class="left">       int tcp_numlayers;</td><td> </td><td class="right">       int tcp_numlayers;</td><td class="lineno" valign="top"></td></tr>
 245       <tr><td><a name="diff0009" /></td></tr>
 246       <tr><td class="lineno" valign="top"></td><td class="lblock">    <span class="delete">   /** rates of layers</span> */</td><td> </td><td class="rblock">    <span class="insert">/** rates of layers - might be subsequently limited by the max_cs_size
 247 field</span> */</td><td class="lineno" valign="top"></td></tr>
 248       <tr><td class="lineno" valign="top"></td><td class="left">       float tcp_rates[100];</td><td> </td><td class="right">       float tcp_rates[100];</td><td class="lineno" valign="top"></td></tr>
 249       <tr><td class="lineno" valign="top"></td><td class="left">       /** different psnr for successive layers */</td><td> </td><td class="right">       /** different psnr for successive layers */</td><td class="lineno" valign="top"></td></tr>
 250       <tr><td class="lineno" valign="top"></td><td class="left">       float tcp_distoratio[100];</td><td> </td><td class="right">       float tcp_distoratio[100];</td><td class="lineno" valign="top"></td></tr>
 251       <tr><td class="lineno" valign="top"></td><td class="left">       /** number of resolutions */</td><td> </td><td class="right">       /** number of resolutions */</td><td class="lineno" valign="top"></td></tr>
 252       <tr><td class="lineno" valign="top"></td><td class="left">       int numresolution;</td><td> </td><td class="right">       int numresolution;</td><td class="lineno" valign="top"></td></tr>
 253       <tr><td class="lineno" valign="top"></td><td class="left">       /** initial code block width, default to 64 */</td><td> </td><td class="right">       /** initial code block width, default to 64 */</td><td class="lineno" valign="top"></td></tr>
 254       <tr><td class="lineno" valign="top"></td><td class="left">       int cblockw_init;</td><td> </td><td class="right">       int cblockw_init;</td><td class="lineno" valign="top"></td></tr>
 255       <tr><td class="lineno" valign="top"></td><td class="left">       /** initial code block height, default to 64 */</td><td> </td><td class="right">       /** initial code block height, default to 64 */</td><td class="lineno" valign="top"></td></tr>
 256       <tr><td class="lineno" valign="top"></td><td class="left">       int cblockh_init;</td><td> </td><td class="right">       int cblockh_init;</td><td class="lineno" valign="top"></td></tr>
 257       <tr><td class="lineno" valign="top"></td><td class="left">       /** mode switch (cblk_style) */</td><td> </td><td class="right">       /** mode switch (cblk_style) */</td><td class="lineno" valign="top"></td></tr>
 258       <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
 259       <tr bgcolor="gray" ><td></td><th><a name="part-l3" /><small>skipping to change at</small><em> line 396</em></th><th> </th><th><a name="part-r3" /><small>skipping to change at</small><em> line 459</em></th><td></td></tr>
 260       <tr><td class="lineno" valign="top"></td><td class="left">       int jpwl_sens_range;</td><td> </td><td class="right">       int jpwl_sens_range;</td><td class="lineno" valign="top"></td></tr>
 261       <tr><td class="lineno" valign="top"></td><td class="left">       /** sensitivity method for MH (-1=no,0-7) */</td><td> </td><td class="right">       /** sensitivity method for MH (-1=no,0-7) */</td><td class="lineno" valign="top"></td></tr>
 262       <tr><td class="lineno" valign="top"></td><td class="left">       int jpwl_sens_MH;</td><td> </td><td class="right">       int jpwl_sens_MH;</td><td class="lineno" valign="top"></td></tr>
 263       <tr><td class="lineno" valign="top"></td><td class="left">       /** tile number of sensitivity specification (&gt;=0) */</td><td> </td><td class="right">       /** tile number of sensitivity specification (&gt;=0) */</td><td class="lineno" valign="top"></td></tr>
 264       <tr><td class="lineno" valign="top"></td><td class="left">       int jpwl_sens_TPH_tileno[JPWL_MAX_NO_TILESPECS];</td><td> </td><td class="right">       int jpwl_sens_TPH_tileno[JPWL_MAX_NO_TILESPECS];</td><td class="lineno" valign="top"></td></tr>
 265       <tr><td class="lineno" valign="top"></td><td class="left">       /** sensitivity methods for TPHs (-1=no,0-7) */</td><td> </td><td class="right">       /** sensitivity methods for TPHs (-1=no,0-7) */</td><td class="lineno" valign="top"></td></tr>
 266       <tr><td class="lineno" valign="top"></td><td class="left">       int jpwl_sens_TPH[JPWL_MAX_NO_TILESPECS];</td><td> </td><td class="right">       int jpwl_sens_TPH[JPWL_MAX_NO_TILESPECS];</td><td class="lineno" valign="top"></td></tr>
 267       <tr><td class="lineno" valign="top"></td><td class="left">       /*@}*/</td><td> </td><td class="right">       /*@}*/</td><td class="lineno" valign="top"></td></tr>
 268       <tr><td class="lineno" valign="top"></td><td class="left">/* &lt;&lt;UniPG */</td><td> </td><td class="right">/* &lt;&lt;UniPG */</td><td class="lineno" valign="top"></td></tr>
 269       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 270       <tr><td><a name="diff0010" /></td></tr>
 271       <tr><td class="lineno" valign="top"></td><td class="lblock">       /** Digital Cinema compliance 0-not compliant, <span class="delete">1-compliant*/</span></td><td> </td><td class="rblock">    /**</td><td class="lineno" valign="top"></td></tr>
 272       <tr><td class="lineno" valign="top"></td><td class="lblock">       OPJ_CINEMA_MODE cp_cinema;</td><td> </td><td class="rblock">     <span class="insert">* DEPRECATED: use RSIZ, OPJ_PROFILE_* and MAX_COMP_SIZE instead</span></td><td class="lineno" valign="top"></td></tr>
 273       <tr><td class="lineno" valign="top"></td><td class="lblock">       /** Maximum <span class="delete">rate</span> for each component. If == 0, component size <span class="delete">limitat</span></td><td> </td><td class="rblock"><span class="insert">     *</span> Digital Cinema compliance 0-not compliant, <span class="insert">1-compliant</span></td><td class="lineno" valign="top"></td></tr>
 274       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">ion</span> is not considered */</td><td> </td><td class="rblock"><span class="insert">     * */</span></td><td class="lineno" valign="top"></td></tr>
 275       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">    OPJ_CINEMA_MODE cp_cinema;</td><td class="lineno" valign="top"></td></tr>
 276       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">    /**</td><td class="lineno" valign="top"></td></tr>
 277       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">     <span class="insert">*</span> Maximum <span class="insert">size (in bytes)</span> for each component.</td><td class="lineno" valign="top"></td></tr>
 278       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">     <span class="insert">*</span> If == 0, component size <span class="insert">limitation</span> is not considered</td><td class="lineno" valign="top"></td></tr>
 279       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">     <span class="insert">*</span> */</td><td class="lineno" valign="top"></td></tr>
 280       <tr><td class="lineno" valign="top"></td><td class="left">       int max_comp_size;</td><td> </td><td class="right">       int max_comp_size;</td><td class="lineno" valign="top"></td></tr>
 281       <tr><td><a name="diff0011" /></td></tr>
 282       <tr><td class="lineno" valign="top"></td><td class="lblock">       /** Profile <span class="delete">name*/</span></td><td> </td><td class="rblock">    /**</td><td class="lineno" valign="top"></td></tr>
 283       <tr><td class="lineno" valign="top"></td><td class="lblock">       OPJ_RSIZ_CAPABILITIES cp_rsiz;</td><td> </td><td class="rblock">     <span class="insert">* DEPRECATED: use RSIZ, OPJ_PROFILE_* and OPJ_EXTENSION_* instead</span></td><td class="lineno" valign="top"></td></tr>
 284       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">     *</span> Profile <span class="insert">name</span></td><td class="lineno" valign="top"></td></tr>
 285       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">     * */</span></td><td class="lineno" valign="top"></td></tr>
 286       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">    OPJ_RSIZ_CAPABILITIES cp_rsiz;</td><td class="lineno" valign="top"></td></tr>
 287       <tr><td class="lineno" valign="top"></td><td class="left">       /** Tile part generation*/</td><td> </td><td class="right">       /** Tile part generation*/</td><td class="lineno" valign="top"></td></tr>
 288       <tr><td class="lineno" valign="top"></td><td class="left">       char tp_on;</td><td> </td><td class="right">       char tp_on;</td><td class="lineno" valign="top"></td></tr>
 289       <tr><td class="lineno" valign="top"></td><td class="left">       /** Flag for Tile part generation*/</td><td> </td><td class="right">       /** Flag for Tile part generation*/</td><td class="lineno" valign="top"></td></tr>
 290       <tr><td class="lineno" valign="top"></td><td class="left">       char tp_flag;</td><td> </td><td class="right">       char tp_flag;</td><td class="lineno" valign="top"></td></tr>
 291       <tr><td class="lineno" valign="top"></td><td class="left">       /** MCT (multiple component transform) */</td><td> </td><td class="right">       /** MCT (multiple component transform) */</td><td class="lineno" valign="top"></td></tr>
 292       <tr><td class="lineno" valign="top"></td><td class="left">       char tcp_mct;</td><td> </td><td class="right">       char tcp_mct;</td><td class="lineno" valign="top"></td></tr>
 293       <tr><td class="lineno" valign="top"></td><td class="left">       /** Enable JPIP indexing*/</td><td> </td><td class="right">       /** Enable JPIP indexing*/</td><td class="lineno" valign="top"></td></tr>
 294       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_BOOL jpip_on;</td><td> </td><td class="right">       OPJ_BOOL jpip_on;</td><td class="lineno" valign="top"></td></tr>
 295       <tr><td class="lineno" valign="top"></td><td class="left">       /** Naive implementation of MCT restricted to a single reversible ar
 296 ray based</td><td> </td><td class="right">       /** Naive implementation of MCT restricted to a single reversible ar
 297 ray based</td><td class="lineno" valign="top"></td></tr>
 298       <tr><td class="lineno" valign="top"></td><td class="left">        encoding without offset concerning all the components. */</td><td> </td><td class="right">        encoding without offset concerning all the components. */</td><td class="lineno" valign="top"></td></tr>
 299       <tr><td class="lineno" valign="top"></td><td class="left">       void * mct_data;</td><td> </td><td class="right">       void * mct_data;</td><td class="lineno" valign="top"></td></tr>
 300       <tr><td><a name="diff0012" /></td></tr>
 301       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">    <span class="insert">/**</span></td><td class="lineno" valign="top"></td></tr>
 302       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">     * Maximum size (in bytes) for the whole codestream.</span></td><td class="lineno" valign="top"></td></tr>
 303       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">     * If == 0, codestream size limitation is not considered</span></td><td class="lineno" valign="top"></td></tr>
 304       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">     * If it does not comply with tcp_rates, max_cs_size prevails</span></td><td class="lineno" valign="top"></td></tr>
 305       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">     * and a warning is issued.</span></td><td class="lineno" valign="top"></td></tr>
 306       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">     * */</span></td><td class="lineno" valign="top"></td></tr>
 307       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">    int max_cs_size;</span></td><td class="lineno" valign="top"></td></tr>
 308       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">    /** RSIZ value</span></td><td class="lineno" valign="top"></td></tr>
 309       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">        To be used to combine OPJ_PROFILE_*, OPJ_EXTENSION_* and (sub)level</span></td><td class="lineno" valign="top"></td></tr>
 310       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">s values. */</span></td><td class="lineno" valign="top"></td></tr>
 311       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">    OPJ_UINT16 rsiz;</span></td><td class="lineno" valign="top"></td></tr>
 312       <tr><td class="lineno" valign="top"></td><td class="left">} opj_cparameters_t;</td><td> </td><td class="right">} opj_cparameters_t;</td><td class="lineno" valign="top"></td></tr>
 313       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 314       <tr><td class="lineno" valign="top"></td><td class="left">#define OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG     0x0001</td><td> </td><td class="right">#define OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG     0x0001</td><td class="lineno" valign="top"></td></tr>
 315       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 316       <tr><td class="lineno" valign="top"></td><td class="left">/**</td><td> </td><td class="right">/**</td><td class="lineno" valign="top"></td></tr>
 317       <tr><td class="lineno" valign="top"></td><td class="left"> * Decompression parameters</td><td> </td><td class="right"> * Decompression parameters</td><td class="lineno" valign="top"></td></tr>
 318       <tr><td class="lineno" valign="top"></td><td class="left"> * */</td><td> </td><td class="right"> * */</td><td class="lineno" valign="top"></td></tr>
 319       <tr><td class="lineno" valign="top"></td><td class="left">typedef struct opj_dparameters {</td><td> </td><td class="right">typedef struct opj_dparameters {</td><td class="lineno" valign="top"></td></tr>
 320       <tr><td class="lineno" valign="top"></td><td class="left">       /**</td><td> </td><td class="right">       /**</td><td class="lineno" valign="top"></td></tr>
 321       <tr><td class="lineno" valign="top"></td><td class="left">       Set the number of highest resolution levels to be discarded.</td><td> </td><td class="right">       Set the number of highest resolution levels to be discarded.</td><td class="lineno" valign="top"></td></tr>
 322       <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
 323       <tr bgcolor="gray" ><td></td><th><a name="part-l4" /><small>skipping to change at</small><em> line 522</em></th><th> </th><th><a name="part-r4" /><small>skipping to change at</small><em> line 604</em></th><td></td></tr>
 324       <tr><td class="lineno" valign="top"></td><td class="left"> * Callback function prototype for skip function</td><td> </td><td class="right"> * Callback function prototype for skip function</td><td class="lineno" valign="top"></td></tr>
 325       <tr><td class="lineno" valign="top"></td><td class="left"> */</td><td> </td><td class="right"> */</td><td class="lineno" valign="top"></td></tr>
 326       <tr><td class="lineno" valign="top"></td><td class="left">typedef OPJ_OFF_T (* opj_stream_skip_fn) (OPJ_OFF_T p_nb_bytes, void * p_us
 327 er_data) ;</td><td> </td><td class="right">typedef OPJ_OFF_T (* opj_stream_skip_fn) (OPJ_OFF_T p_nb_bytes, void * p_us
 328 er_data) ;</td><td class="lineno" valign="top"></td></tr>
 329       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 330       <tr><td class="lineno" valign="top"></td><td class="left">/*</td><td> </td><td class="right">/*</td><td class="lineno" valign="top"></td></tr>
 331       <tr><td class="lineno" valign="top"></td><td class="left"> * Callback function prototype for seek function</td><td> </td><td class="right"> * Callback function prototype for seek function</td><td class="lineno" valign="top"></td></tr>
 332       <tr><td class="lineno" valign="top"></td><td class="left"> */</td><td> </td><td class="right"> */</td><td class="lineno" valign="top"></td></tr>
 333       <tr><td class="lineno" valign="top"></td><td class="left">typedef OPJ_BOOL (* opj_stream_seek_fn) (OPJ_OFF_T p_nb_bytes, void * p_use
 334 r_data) ;</td><td> </td><td class="right">typedef OPJ_BOOL (* opj_stream_seek_fn) (OPJ_OFF_T p_nb_bytes, void * p_use
 335 r_data) ;</td><td class="lineno" valign="top"></td></tr>
 336       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 337       <tr><td class="lineno" valign="top"></td><td class="left">/*</td><td> </td><td class="right">/*</td><td class="lineno" valign="top"></td></tr>
 338       <tr><td><a name="diff0013" /></td></tr>
 339       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"> <span class="insert">* Callback function prototype for free user data function</span></td><td class="lineno" valign="top"></td></tr>
 340       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> */</span></td><td class="lineno" valign="top"></td></tr>
 341       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">typedef void (* opj_stream_free_user_data_fn) (void * p_user_data) ;</span></td><td class="lineno" valign="top"></td></tr>
 342       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"></span></td><td class="lineno" valign="top"></td></tr>
 343       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">/*</span></td><td class="lineno" valign="top"></td></tr>
 344       <tr><td class="lineno" valign="top"></td><td class="left"> * JPEG2000 Stream.</td><td> </td><td class="right"> * JPEG2000 Stream.</td><td class="lineno" valign="top"></td></tr>
 345       <tr><td class="lineno" valign="top"></td><td class="left"> */</td><td> </td><td class="right"> */</td><td class="lineno" valign="top"></td></tr>
 346       <tr><td class="lineno" valign="top"></td><td class="left">typedef void * opj_stream_t;</td><td> </td><td class="right">typedef void * opj_stream_t;</td><td class="lineno" valign="top"></td></tr>
 347       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 348       <tr><td class="lineno" valign="top"></td><td class="left">/*</td><td> </td><td class="right">/*</td><td class="lineno" valign="top"></td></tr>
 349       <tr><td class="lineno" valign="top"></td><td class="left">==========================================================</td><td> </td><td class="right">==========================================================</td><td class="lineno" valign="top"></td></tr>
 350       <tr><td class="lineno" valign="top"></td><td class="left">   image typedef definitions</td><td> </td><td class="right">   image typedef definitions</td><td class="lineno" valign="top"></td></tr>
 351       <tr><td class="lineno" valign="top"></td><td class="left">==========================================================</td><td> </td><td class="right">==========================================================</td><td class="lineno" valign="top"></td></tr>
 352       <tr><td class="lineno" valign="top"></td><td class="left">*/</td><td> </td><td class="right">*/</td><td class="lineno" valign="top"></td></tr>
 353       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 354       <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
 355       <tr bgcolor="gray" ><td></td><th><a name="part-l5" /><small>skipping to change at</small><em> line 560</em></th><th> </th><th><a name="part-r5" /><small>skipping to change at</small><em> line 647</em></th><td></td></tr>
 356       <tr><td class="lineno" valign="top"></td><td class="left">       /** image depth in bits */</td><td> </td><td class="right">       /** image depth in bits */</td><td class="lineno" valign="top"></td></tr>
 357       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_UINT32 bpp;</td><td> </td><td class="right">       OPJ_UINT32 bpp;</td><td class="lineno" valign="top"></td></tr>
 358       <tr><td class="lineno" valign="top"></td><td class="left">       /** signed (1) / unsigned (0) */</td><td> </td><td class="right">       /** signed (1) / unsigned (0) */</td><td class="lineno" valign="top"></td></tr>
 359       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_UINT32 sgnd;</td><td> </td><td class="right">       OPJ_UINT32 sgnd;</td><td class="lineno" valign="top"></td></tr>
 360       <tr><td class="lineno" valign="top"></td><td class="left">       /** number of decoded resolution */</td><td> </td><td class="right">       /** number of decoded resolution */</td><td class="lineno" valign="top"></td></tr>
 361       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_UINT32 resno_decoded;</td><td> </td><td class="right">       OPJ_UINT32 resno_decoded;</td><td class="lineno" valign="top"></td></tr>
 362       <tr><td class="lineno" valign="top"></td><td class="left">       /** number of division by 2 of the out image compared to the origina
 363 l size of image */</td><td> </td><td class="right">       /** number of division by 2 of the out image compared to the origina
 364 l size of image */</td><td class="lineno" valign="top"></td></tr>
 365       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_UINT32 factor;</td><td> </td><td class="right">       OPJ_UINT32 factor;</td><td class="lineno" valign="top"></td></tr>
 366       <tr><td class="lineno" valign="top"></td><td class="left">       /** image component data */</td><td> </td><td class="right">       /** image component data */</td><td class="lineno" valign="top"></td></tr>
 367       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_INT32 *data;</td><td> </td><td class="right">       OPJ_INT32 *data;</td><td class="lineno" valign="top"></td></tr>
 368       <tr><td><a name="diff0014" /></td></tr>
 369       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">  <span class="insert">/** alpha channel */</span></td><td class="lineno" valign="top"></td></tr>
 370       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">  OPJ_UINT16 alpha;</span></td><td class="lineno" valign="top"></td></tr>
 371       <tr><td class="lineno" valign="top"></td><td class="left">} opj_image_comp_t;</td><td> </td><td class="right">} opj_image_comp_t;</td><td class="lineno" valign="top"></td></tr>
 372       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 373       <tr><td class="lineno" valign="top"></td><td class="left">/**</td><td> </td><td class="right">/**</td><td class="lineno" valign="top"></td></tr>
 374       <tr><td class="lineno" valign="top"></td><td class="left"> * Defines image data and characteristics</td><td> </td><td class="right"> * Defines image data and characteristics</td><td class="lineno" valign="top"></td></tr>
 375       <tr><td class="lineno" valign="top"></td><td class="left"> * */</td><td> </td><td class="right"> * */</td><td class="lineno" valign="top"></td></tr>
 376       <tr><td class="lineno" valign="top"></td><td class="left">typedef struct opj_image {</td><td> </td><td class="right">typedef struct opj_image {</td><td class="lineno" valign="top"></td></tr>
 377       <tr><td class="lineno" valign="top"></td><td class="left">       /** XOsiz: horizontal offset from the origin of the reference grid t
 378 o the left side of the image area */</td><td> </td><td class="right">       /** XOsiz: horizontal offset from the origin of the reference grid t
 379 o the left side of the image area */</td><td class="lineno" valign="top"></td></tr>
 380       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_UINT32 x0;</td><td> </td><td class="right">       OPJ_UINT32 x0;</td><td class="lineno" valign="top"></td></tr>
 381       <tr><td class="lineno" valign="top"></td><td class="left">       /** YOsiz: vertical offset from the origin of the reference grid to
 382 the top side of the image area */</td><td> </td><td class="right">       /** YOsiz: vertical offset from the origin of the reference grid to
 383 the top side of the image area */</td><td class="lineno" valign="top"></td></tr>
 384       <tr><td class="lineno" valign="top"></td><td class="left">       OPJ_UINT32 y0;</td><td> </td><td class="right">       OPJ_UINT32 y0;</td><td class="lineno" valign="top"></td></tr>
 385       <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
 386       <tr bgcolor="gray" ><td></td><th><a name="part-l6" /><small>skipping to change at</small><em> line 1054</em></th><th> </th><th><a name="part-r6" /><small>skipping to change at</small><em> line 1143</em></th><td></td></tr>
 387       <tr><td class="lineno" valign="top"></td><td class="left"> * Sets the given function to be used as a seek function, the stream is the
 388 n seekable.</td><td> </td><td class="right"> * Sets the given function to be used as a seek function, the stream is the
 389 n seekable.</td><td class="lineno" valign="top"></td></tr>
 390       <tr><td class="lineno" valign="top"></td><td class="left"> * @param              p_stream        the stream to modify</td><td> </td><td class="right"> * @param              p_stream        the stream to modify</td><td class="lineno" valign="top"></td></tr>
 391       <tr><td class="lineno" valign="top"></td><td class="left"> * @param              p_function      the function to use a skip function.</td><td> </td><td class="right"> * @param              p_function      the function to use a skip function.</td><td class="lineno" valign="top"></td></tr>
 392       <tr><td class="lineno" valign="top"></td><td class="left">*/</td><td> </td><td class="right">*/</td><td class="lineno" valign="top"></td></tr>
 393       <tr><td class="lineno" valign="top"></td><td class="left">OPJ_API void OPJ_CALLCONV opj_stream_set_seek_function(opj_stream_t* p_stre
 394 am, opj_stream_seek_fn p_function);</td><td> </td><td class="right">OPJ_API void OPJ_CALLCONV opj_stream_set_seek_function(opj_stream_t* p_stre
 395 am, opj_stream_seek_fn p_function);</td><td class="lineno" valign="top"></td></tr>
 396       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 397       <tr><td class="lineno" valign="top"></td><td class="left">/**</td><td> </td><td class="right">/**</td><td class="lineno" valign="top"></td></tr>
 398       <tr><td class="lineno" valign="top"></td><td class="left"> * Sets the given data to be used as a user data for the stream.</td><td> </td><td class="right"> * Sets the given data to be used as a user data for the stream.</td><td class="lineno" valign="top"></td></tr>
 399       <tr><td class="lineno" valign="top"></td><td class="left"> * @param              p_stream        the stream to modify</td><td> </td><td class="right"> * @param              p_stream        the stream to modify</td><td class="lineno" valign="top"></td></tr>
 400       <tr><td class="lineno" valign="top"></td><td class="left"> * @param              p_data          the data to set.</td><td> </td><td class="right"> * @param              p_data          the data to set.</td><td class="lineno" valign="top"></td></tr>
 401       <tr><td><a name="diff0015" /></td></tr>
 402       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> * @param              p_function      the function to free p_data when opj
 403 _stream_destroy() is called.</span></td><td class="lineno" valign="top"></td></tr>
 404       <tr><td class="lineno" valign="top"></td><td class="left">*/</td><td> </td><td class="right">*/</td><td class="lineno" valign="top"></td></tr>
 405       <tr><td><a name="diff0016" /></td></tr>
 406       <tr><td class="lineno" valign="top"></td><td class="lblock">OPJ_API void OPJ_CALLCONV opj_stream_set_user_data (opj_stream_t* p_stream,
 407  void * p_data);</td><td> </td><td class="rblock">OPJ_API void OPJ_CALLCONV opj_stream_set_user_data (opj_stream_t* p_stream,
 408  void * p_data<span class="insert">, opj_stream_free_user_data_fn p_function</span>);</td><td class="lineno" valign="top"></td></tr>
 409       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 410       <tr><td class="lineno" valign="top"></td><td class="left">/**</td><td> </td><td class="right">/**</td><td class="lineno" valign="top"></td></tr>
 411       <tr><td class="lineno" valign="top"></td><td class="left"> * Sets the length of the user data for the stream.</td><td> </td><td class="right"> * Sets the length of the user data for the stream.</td><td class="lineno" valign="top"></td></tr>
 412       <tr><td class="lineno" valign="top"></td><td class="left"> *</td><td> </td><td class="right"> *</td><td class="lineno" valign="top"></td></tr>
 413       <tr><td class="lineno" valign="top"></td><td class="left"> * @param p_stream    the stream to modify</td><td> </td><td class="right"> * @param p_stream    the stream to modify</td><td class="lineno" valign="top"></td></tr>
 414       <tr><td class="lineno" valign="top"></td><td class="left"> * @param data_length length of the user_data.</td><td> </td><td class="right"> * @param data_length length of the user_data.</td><td class="lineno" valign="top"></td></tr>
 415       <tr><td class="lineno" valign="top"></td><td class="left">*/</td><td> </td><td class="right">*/</td><td class="lineno" valign="top"></td></tr>
 416       <tr><td class="lineno" valign="top"></td><td class="left">OPJ_API void OPJ_CALLCONV opj_stream_set_user_data_length(opj_stream_t* p_s
 417 tream, OPJ_UINT64 data_length);</td><td> </td><td class="right">OPJ_API void OPJ_CALLCONV opj_stream_set_user_data_length(opj_stream_t* p_s
 418 tream, OPJ_UINT64 data_length);</td><td class="lineno" valign="top"></td></tr>
 419       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 420       <tr><td class="lineno" valign="top"></td><td class="left">/**</td><td> </td><td class="right">/**</td><td class="lineno" valign="top"></td></tr>
 421       <tr><td><a name="diff0017" /></td></tr>
 422       <tr><td class="lineno" valign="top"></td><td class="lblock"> * <span class="delete">Helper function.</span></td><td> </td><td class="rblock"> * <span class="insert">Create a</span> stream <span class="insert">from</span> a file <span class="insert">identified with its filename with default pa</span></td><td class="lineno" valign="top"></td></tr>
 423       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete"> * Sets the</span> stream <span class="delete">to be</span> a file <span class="delete">stream. The FILE must have been open previo</span></td><td> </td><td class="rblock"><span class="insert">rameters (helper function)</span></td><td class="lineno" valign="top"></td></tr>
 424       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">usly.</span></td><td> </td><td class="rblock"> * @param <span class="insert">fname             the filename of</span> the file to <span class="insert">stream</span></td><td class="lineno" valign="top"></td></tr>
 425       <tr><td class="lineno" valign="top"></td><td class="lblock"> * @param <span class="delete">p_file</span>            the file <span class="delete">stream</span> to <span class="delete">operate on</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
 426       <tr><td class="lineno" valign="top"></td><td class="left"> * @param p_is_read_stream  whether the stream is a read stream (true) or n
 427 ot (false)</td><td> </td><td class="right"> * @param p_is_read_stream  whether the stream is a read stream (true) or n
 428 ot (false)</td><td class="lineno" valign="top"></td></tr>
 429       <tr><td class="lineno" valign="top"></td><td class="left">*/</td><td> </td><td class="right">*/</td><td class="lineno" valign="top"></td></tr>
 430       <tr><td><a name="diff0018" /></td></tr>
 431       <tr><td class="lineno" valign="top"></td><td class="lblock">OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream (<span class="delete">F
 432 ILE * p_fil</span>e, OPJ_BOOL p_is_read_stream);</td><td> </td><td class="rblock">OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream (<span class="insert">c
 433 onst char *fnam</span>e, OPJ_BOOL p_is_read_stream);</td><td class="lineno" valign="top"></td></tr>
 434       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 435       <tr><td><a name="diff0019" /></td></tr>
 436       <tr><td class="lineno" valign="top"></td><td class="lblock">/**</td><td> </td><td class="rblock">/** <span class="insert">Create a stream from a file identified with its filename with a specifi</span></td><td class="lineno" valign="top"></td></tr>
 437       <tr><td class="lineno" valign="top"></td><td class="lblock"> <span class="delete">* FIXME DOC</span></td><td> </td><td class="rblock"><span class="insert">c buffer size</span></td><td class="lineno" valign="top"></td></tr>
 438       <tr><td class="lineno" valign="top"></td><td class="lblock"> * @param <span class="delete">p_file</span>            the file <span class="delete">stream</span> to <span class="delete">operate on</span></td><td> </td><td class="rblock"> * @param <span class="insert">fname             the filename of</span> the file to <span class="insert">stream</span></td><td class="lineno" valign="top"></td></tr>
 439       <tr><td class="lineno" valign="top"></td><td class="left"> * @param p_buffer_size     size of the chunk used to stream</td><td> </td><td class="right"> * @param p_buffer_size     size of the chunk used to stream</td><td class="lineno" valign="top"></td></tr>
 440       <tr><td class="lineno" valign="top"></td><td class="left"> * @param p_is_read_stream  whether the stream is a read stream (true) or n
 441 ot (false)</td><td> </td><td class="right"> * @param p_is_read_stream  whether the stream is a read stream (true) or n
 442 ot (false)</td><td class="lineno" valign="top"></td></tr>
 443       <tr><td class="lineno" valign="top"></td><td class="left">*/</td><td> </td><td class="right">*/</td><td class="lineno" valign="top"></td></tr>
 444       <tr><td><a name="diff0020" /></td></tr>
 445       <tr><td class="lineno" valign="top"></td><td class="lblock">OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream <span class="delete">(FILE * p_</span></td><td> </td><td class="rblock">OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream <span class="insert">(const cha</span></td><td class="lineno" valign="top"></td></tr>
 446       <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">file, OPJ_SIZE_T</span> p_buffer_size, <span class="delete">OPJ_BOOL</span> p_is_read_stream);</td><td> </td><td class="rblock"><span class="insert">r *fname,</span></td><td class="lineno" valign="top"></td></tr>
 447       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">                                                                     OPJ_SI</span></td><td class="lineno" valign="top"></td></tr>
 448       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">ZE_T</span> p_buffer_size,</td><td class="lineno" valign="top"></td></tr>
 449       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">                                                                     <span class="insert">OPJ_BO</span></td><td class="lineno" valign="top"></td></tr>
 450       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">OL</span> p_is_read_stream);</td><td class="lineno" valign="top"></td></tr>
 451       <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
 452       <tr><td class="lineno" valign="top"></td><td class="left">/*</td><td> </td><td class="right">/*</td><td class="lineno" valign="top"></td></tr>
 453       <tr><td class="lineno" valign="top"></td><td class="left">==========================================================</td><td> </td><td class="right">==========================================================</td><td class="lineno" valign="top"></td></tr>
 454       <tr><td class="lineno" valign="top"></td><td class="left">   event manager functions definitions</td><td> </td><td class="right">   event manager functions definitions</td><td class="lineno" valign="top"></td></tr>
 455       <tr><td class="lineno" valign="top"></td><td class="left">==========================================================</td><td> </td><td class="right">==========================================================</td><td class="lineno" valign="top"></td></tr>
 456       <tr><td class="lineno" valign="top"></td><td class="left">*/</td><td> </td><td class="right">*/</td><td class="lineno" valign="top"></td></tr>
 457       <tr><td class="lineno" valign="top"></td><td class="left">/**</td><td> </td><td class="right">/**</td><td class="lineno" valign="top"></td></tr>
 458       <tr><td class="lineno" valign="top"></td><td class="left"> * Set the info handler use by openjpeg.</td><td> </td><td class="right"> * Set the info handler use by openjpeg.</td><td class="lineno" valign="top"></td></tr>
 459       <tr><td class="lineno" valign="top"></td><td class="left"> * @param p_codec       the codec previously initialise</td><td> </td><td class="right"> * @param p_codec       the codec previously initialise</td><td class="lineno" valign="top"></td></tr>
 460       <tr><td class="lineno" valign="top"></td><td class="left"> * @param p_callback    the callback function which will be used</td><td> </td><td class="right"> * @param p_callback    the callback function which will be used</td><td class="lineno" valign="top"></td></tr>
 461
 462      <tr><td></td><td class="left"></td><td> </td><td class="right"></td><td></td></tr>
 463      <tr bgcolor="gray"><th colspan="5" align="center"><a name="end">&nbsp;End of changes. 20 change blocks.&nbsp;</a></th></tr>
 464      <tr class="stats"><td></td><th><i>34 lines changed or deleted</i></th><th><i> </i></th><th><i>159 lines changed or added</i></th><td></td></tr>
 465      <tr><td colspan="5" align="center" class="small"></td></tr>
 466    </table>
 467    <br/><br/>
 468
 469   <table class='diff_tbl' border="0" cellpadding="0" cellspacing="0">
 470   <tr bgcolor="orange"><th></th><th>&nbsp;opj_config.h (2.0.1)&nbsp;</th><th> </th><th>&nbsp;opj_config.h (2.1)&nbsp;</th><th></th></tr>
 471       <tr><td class="lineno" valign="top"></td><td class="left">/* create opj_config.h for CMake */</td><td> </td><td class="right">/* create opj_config.h for CMake */</td><td class="lineno" valign="top"></td></tr>
 472       <tr><td class="lineno" valign="top"></td><td class="left">#define OPJ_HAVE_STDINT_H              1</td><td> </td><td class="right">#define OPJ_HAVE_STDINT_H              1</td><td class="lineno" valign="top"></td></tr>
 473       <tr><td><a name="diff0001" /></td></tr>
 474       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">                                                                           </td><td class="lineno" valign="top"></td></tr>
 475       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">/*-------------------------------------------------------------------------</span></td><td class="lineno" valign="top"></td></tr>
 476       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">-*/</span></td><td class="lineno" valign="top"></td></tr>
 477       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">/* OpenJPEG Versioning                                                     </span></td><td class="lineno" valign="top"></td></tr>
 478       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"> */</span></td><td class="lineno" valign="top"></td></tr>
 479       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"></span></td><td class="lineno" valign="top"></td></tr>
 480       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">/* Version number. */</span></td><td class="lineno" valign="top"></td></tr>
 481       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_VERSION_MAJOR 2</span></td><td class="lineno" valign="top"></td></tr>
 482       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_VERSION_MINOR 1</span></td><td class="lineno" valign="top"></td></tr>
 483       <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_VERSION_BUILD 0</span></td><td class="lineno" valign="top"></td></tr>
 484
 485      <tr><td></td><td class="left"></td><td> </td><td class="right"></td><td></td></tr>
 486      <tr bgcolor="gray"><th colspan="5" align="center"><a name="end">&nbsp;End of changes. 1 change blocks.&nbsp;</a></th></tr>
 487      <tr class="stats"><td></td><th><i>0 lines changed or deleted</i></th><th><i> </i></th><th><i>0 lines changed or added</i></th><td></td></tr>
 488      <tr><td colspan="5" align="center" class="small"></td></tr>
 489    </table>
 490    <br/><div style='width:100%;' align='left' class='small'>This html diff was produced by rfcdiff 1.41.The latest version is available from <a href='http://tools.ietf.org/tools/rfcdiff/'>http://tools.ietf.org/tools/rfcdiff/</a></div>
 491 </td></tr></table>
 492 </body>
 493 </html>