Update ABI/API compatibility reports after commit 774889a328

abi-check/changelog/openjpeg/current/log.html

@@ -20,7 +20,16 @@
 <br/>
 <h1>Changelog from Git</h1><br/><br/>
 <div class='changelog'>
-<pre class='wrap'>commit b6b7e96b0cf7819ef6a2e8ba2f8bdaaf938326ed
+<pre class='wrap'>commit 774889a328abd5d3c280d9a897f1ac4c672cb0e5
+Merge: b6b7e96 271a71e
+Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
+Date:   2020-04-17 00:39:46 +0200
+
+    Merge pull request #1244 from rouault/fix_pi_warnings
+    
+    Fix warnings about signed/unsigned casts in pi.c
+
+commit b6b7e96b0cf7819ef6a2e8ba2f8bdaaf938326ed
 Author: szukw000 &lt;szukw000@arcor.de&gt;
 Date:   2020-04-17 00:37:33 +0200
 
@@ -34,6 +43,12 @@ Date:   2020-04-16 19:09:40 -0300
     
     This issues were found by cppcheck and coverity.
 
+commit 271a71ef0f1dd4740c9f4474279c7da8d15850c9
+Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
+Date:   2020-04-16 20:52:44 +0200
+
+    Fix warnings about signed/unsigned casts in pi.c
+
 commit 221a801a97a3ea968a311f7905c18a1eb7f034c4
 Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
 Date:   2020-04-16 20:33:22 +0200
@@ -875,28 +890,6 @@ Date:   2018-06-20 14:54:09 +0200
 
     Avoid assertion when running opj_j2k_merge_ppt() several time due to e6674f7ed66abdb32a0be5944f618722b6a7b5d5 revert. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2785
 
-commit 832dfd18665da08745748bde2d2563f00c7cd9e7
-Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
-Date:   2018-06-20 14:38:41 +0200
-
-    Revert "Avoid assertion in opj_j2k_merge_ppt() in case premature EOC is encountered in opj_j2k_read_tile_header(). Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2785. Credit to OSS Fuzz" (fixes #1120)
-    
-    This reverts commit 9906fbf737692486cebabe98169988d818e2e66a.
-    which broke decoding of images where TNsot == 0
-
-commit 4aaf52ec8d8ec7b94c73f77f9c0029a3d3cabbf9
-Author: Stefan Weil &lt;sw@weilnetz.de&gt;
-Date:   2018-06-18 14:06:25 +0200
-
-    Use local type declaration for POSIX standard type only for MS compiler
-    
-    ssize_t is a POSIX type which is declared in POSIX include files.
-    Mingw-w64 provides it also for Windows.
-    
-    Use the local declaration only with MS compilers.
-    
-    Signed-off-by: Stefan Weil &lt;sw@weilnetz.de&gt;
-
 ...</pre></div>
 
 </body>

abi-check/db/openjpeg/Tracker.data

@@ -705,7 +705,7 @@ $VAR1 = {
                       '2.2.0' => '2017-08-10 00:31',
                       '2.3.0' => '2017-10-04 22:23',
                       '2.3.1' => '2019-04-02 10:08',
-                      'current' => '2020-04-17 00:37:33'
+                      'current' => '2020-04-17 00:39:46'
                     },
           'HeadersDiff' => {
                              '1.1' => {
@@ -813,7 +813,7 @@ $VAR1 = {
           'Maintainer' => 'OpenJPEG team',
           'MaintainerUrl' => 'http://www.openjpeg.org/',
           'PackageDiff' => {},
-          'ScmUpdateTime' => '1587077231',
+          'ScmUpdateTime' => '1587077836',
           'Soname' => {
                         '1.1' => {
                                    'lib/libopenjpeg.so' => 'libopenjpeg.so'

abi-check/headers_diff/openjpeg/2.3.1/current/diff.html

@@ -162,7 +162,29 @@ t for 2K @ 48fps */</td><td class="lineno"></td></tr>
       <tr><td class="lineno"></td><td class="left">/*</td><td> </td><td class="right">/*</td><td class="lineno"></td></tr>
       <tr><td class="lineno"></td><td class="left">==========================================================</td><td> </td><td class="right">==========================================================</td><td class="lineno"></td></tr>
       <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
-      <tr id="part-2" class="change" ><td></td><th><small>skipping to change at</small><a href="#part-2"><em> line 334<span class="hide"> &para;</span></em></a></th><th> </th><th><small>skipping to change at</small><a href="#part-2"><em> line 364<span class="hide"> &para;</span></em></a></th><td></td></tr>
+      <tr id="part-2" class="change" ><td></td><th><small>skipping to change at</small><a href="#part-2"><em> line 319<span class="hide"> &para;</span></em></a></th><th> </th><th><small>skipping to change at</small><a href="#part-2"><em> line 349<span class="hide"> &para;</span></em></a></th><td></td></tr>
+      <tr><td class="lineno"></td><td class="left"> * @param client_data       Client object where will be return the event me
+ssage</td><td> </td><td class="right"> * @param client_data       Client object where will be return the event me
+ssage</td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="left"> * */</td><td> </td><td class="right"> * */</td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="left">typedef void (*opj_msg_callback)(const char *msg, void *client_data);</td><td> </td><td class="right">typedef void (*opj_msg_callback)(const char *msg, void *client_data);</td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="left">/*</td><td> </td><td class="right">/*</td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="left">==========================================================</td><td> </td><td class="right">==========================================================</td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="left">   codec typedef definitions</td><td> </td><td class="right">   codec typedef definitions</td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="left">==========================================================</td><td> </td><td class="right">==========================================================</td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="left">*/</td><td> </td><td class="right">*/</td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
+      <tr id="diff0004"><td></td></tr>
+      <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#ifndef OPJ_UINT32_SEMANTICALLY_BUT_INT32</span></td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_UINT32_SEMANTICALLY_BUT_INT32 OPJ_INT32</span></td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#endif</span></td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock">                                                                           </td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="left">/**</td><td> </td><td class="right">/**</td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="left"> * Progression order changes</td><td> </td><td class="right"> * Progression order changes</td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="left"> *</td><td> </td><td class="right"> *</td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="left"> */</td><td> </td><td class="right"> */</td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="left">typedef struct opj_poc {</td><td> </td><td class="right">typedef struct opj_poc {</td><td class="lineno"></td></tr>
       <tr><td class="lineno"></td><td class="left">    /** Resolution num start, Component num start, given by POC */</td><td> </td><td class="right">    /** Resolution num start, Component num start, given by POC */</td><td class="lineno"></td></tr>
       <tr><td class="lineno"></td><td class="left">    OPJ_UINT32 resno0, compno0;</td><td> </td><td class="right">    OPJ_UINT32 resno0, compno0;</td><td class="lineno"></td></tr>
       <tr><td class="lineno"></td><td class="left">    /** Layer num end,Resolution num end, Component num end, given by POC *
@@ -175,11 +197,12 @@ t for 2K @ 48fps */</td><td class="lineno"></td></tr>
       <tr><td class="lineno"></td><td class="left">    OPJ_PROG_ORDER prg1, prg;</td><td> </td><td class="right">    OPJ_PROG_ORDER prg1, prg;</td><td class="lineno"></td></tr>
       <tr><td class="lineno"></td><td class="left">    /** Progression order string*/</td><td> </td><td class="right">    /** Progression order string*/</td><td class="lineno"></td></tr>
       <tr><td class="lineno"></td><td class="left">    OPJ_CHAR progorder[5];</td><td> </td><td class="right">    OPJ_CHAR progorder[5];</td><td class="lineno"></td></tr>
-      <tr id="diff0004"><td></td></tr>
+      <tr id="diff0005"><td></td></tr>
       <tr><td class="lineno"></td><td class="lblock">    /** Tile number */</td><td> </td><td class="rblock">    /** Tile number <span class="insert">(starting at 1) </span>*/</td><td class="lineno"></td></tr>
       <tr><td class="lineno"></td><td class="left">    OPJ_UINT32 tile;</td><td> </td><td class="right">    OPJ_UINT32 tile;</td><td class="lineno"></td></tr>
       <tr><td class="lineno"></td><td class="left">    /** Start and end values for Tile width and height*/</td><td> </td><td class="right">    /** Start and end values for Tile width and height*/</td><td class="lineno"></td></tr>
-      <tr><td class="lineno"></td><td class="left">    OPJ_INT32 tx0, tx1, ty0, ty1;</td><td> </td><td class="right">    OPJ_INT32 tx0, tx1, ty0, ty1;</td><td class="lineno"></td></tr>
+      <tr id="diff0006"><td></td></tr>
+      <tr><td class="lineno"></td><td class="lblock">    OPJ_INT32 tx0, tx1, ty0, ty1;</td><td> </td><td class="rblock">    OPJ_<span class="insert">UINT32_SEMANTICALLY_BUT_</span>INT32 tx0, tx1, ty0, ty1;</td><td class="lineno"></td></tr>
       <tr><td class="lineno"></td><td class="left">    /** Start value, initialised in pi_initialise_encode*/</td><td> </td><td class="right">    /** Start value, initialised in pi_initialise_encode*/</td><td class="lineno"></td></tr>
       <tr><td class="lineno"></td><td class="left">    OPJ_UINT32 layS, resS, compS, prcS;</td><td> </td><td class="right">    OPJ_UINT32 layS, resS, compS, prcS;</td><td class="lineno"></td></tr>
       <tr><td class="lineno"></td><td class="left">    /** End value, initialised in pi_initialise_encode */</td><td> </td><td class="right">    /** End value, initialised in pi_initialise_encode */</td><td class="lineno"></td></tr>
@@ -189,10 +212,13 @@ itialise_encode*/</td><td> </td><td class="right">    /** Start and end values o
 itialise_encode*/</td><td class="lineno"></td></tr>
       <tr><td class="lineno"></td><td class="left">    OPJ_UINT32 txS, txE, tyS, tyE, dx, dy;</td><td> </td><td class="right">    OPJ_UINT32 txS, txE, tyS, tyE, dx, dy;</td><td class="lineno"></td></tr>
       <tr><td class="lineno"></td><td class="left">    /** Temporary values for Tile parts, initialised in pi_create_encode */</td><td> </td><td class="right">    /** Temporary values for Tile parts, initialised in pi_create_encode */</td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="left">    OPJ_UINT32 lay_t, res_t, comp_t, prc_t, tx0_t, ty0_t;</td><td> </td><td class="right">    OPJ_UINT32 lay_t, res_t, comp_t, prc_t, tx0_t, ty0_t;</td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="left">} opj_poc_t;</td><td> </td><td class="right">} opj_poc_t;</td><td class="lineno"></td></tr>
+      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
 
      <tr><td></td><td class="left"></td><td> </td><td class="right"></td><td></td></tr>
-     <tr id="end" bgcolor="gray"><th colspan="5" align="center">&nbsp;End of changes. 4 change blocks.&nbsp;</th></tr>
+     <tr id="end" bgcolor="gray"><th colspan="5" align="center">&nbsp;End of changes. 6 change blocks.&nbsp;</th></tr>
-     <tr class="stats"><td></td><th><i>8 lines changed or deleted</i></th><th><i> </i></th><th><i>61 lines changed or added</i></th><td></td></tr>
+     <tr class="stats"><td></td><th><i>9 lines changed or deleted</i></th><th><i> </i></th><th><i>66 lines changed or added</i></th><td></td></tr>
      <tr><td colspan="5" align="center" class="small"></td></tr>
    </table>
    <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>

abi-check/installed/openjpeg/current/include/openjpeg-2.3/openjpeg.h

@@ -348,6 +348,10 @@ typedef void (*opj_msg_callback)(const char *msg, void *client_data);
 ==========================================================
 */
 
+#ifndef OPJ_UINT32_SEMANTICALLY_BUT_INT32
+#define OPJ_UINT32_SEMANTICALLY_BUT_INT32 OPJ_INT32
+#endif
+
 /**
  * Progression order changes
  *
@@ -366,7 +370,7 @@ typedef struct opj_poc {
     /** Tile number (starting at 1) */
     OPJ_UINT32 tile;
     /** Start and end values for Tile width and height*/
-    OPJ_INT32 tx0, tx1, ty0, ty1;
+    OPJ_UINT32_SEMANTICALLY_BUT_INT32 tx0, tx1, ty0, ty1;
     /** Start value, initialised in pi_initialise_encode*/
     OPJ_UINT32 layS, resS, compS, prcS;
     /** End value, initialised in pi_initialise_encode */

abi-check/timeline/openjpeg/index.html

@@ -30,7 +30,7 @@
 <th>Headers<br/>Diff</th>
 </tr>
 <tr id='current'><td>current</td>
-<td>2020-04-17<br/>00:37</td>
+<td>2020-04-17<br/>00:39</td>
 <td>7</td>
 <td><a href='../../changelog/openjpeg/current/log.html'>changelog</a></td>
 <td class='ok'><a href='../../objects_report/openjpeg/2.3.1/current/report.html'>100%</a></td>
@@ -179,7 +179,7 @@
 <td>N/A</td>
 <td>N/A</td>
 </tr>
-</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Thu Apr 16 22:47:47 2020.<br/>
+</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Thu Apr 16 22:57:51 2020.<br/>
 <br/>
 <hr/>
 <div align='right'><a class='home' title="Andrey Ponomarenko's ABI laboratory" href='http://abi-laboratory.pro/'>abi-laboratory.pro</a></div>