ENH: Apply patch from Antonin

diff --git a/src/gdcmopenjpeg/libopenjpeg/j2k.h b/src/gdcmopenjpeg/libopenjpeg/j2k.h
index c6a66b2900e09b8fb3cd582b3a6a0d2b86a03196..b42ecf800f44a1109391708a99353cc634e25108 100644 (file)
--- a/src/gdcmopenjpeg/libopenjpeg/j2k.h
+++ b/src/gdcmopenjpeg/libopenjpeg/j2k.h
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define VERSION "0.0.8"
+#define VERSION "0.0.9"
 
 #if defined(_WIN32) && defined (OPENJPEGDLL)
 #ifdef gdcmopenjpeg_EXPORTS /*LIBJ2K_EXPORTS*/

diff --git a/src/gdcmopenjpeg/libopenjpeg/t1.c b/src/gdcmopenjpeg/libopenjpeg/t1.c
index 6af547a293518ef9b1116a15d2499c0cbab739a9..fee3315ddd0f7704f38ae606edb09716ba8b46c5 100644 (file)
--- a/src/gdcmopenjpeg/libopenjpeg/t1.c
+++ b/src/gdcmopenjpeg/libopenjpeg/t1.c
@@ -896,7 +896,7 @@ void t1_decode_cblks(tcd_tile_t * tile, j2k_tcp_t * tcp)
       for (i = 0; i < cblk->x1 - cblk->x0; i++) {
                   int tmp=t1_data[j][i];
                   if (tmp>>1==0) tilec->data[x + i + (y + j) * (tilec->x1 - tilec->x0)] = 0;
-        else tilec->data[x + i + (y + j) * (tilec->x1 - tilec->x0)] = tmp<0?((tmp>>1) | 0x80000000)+1:(tmp>>1);
+        else tilec->data[x + i + (y + j) * (tilec->x1 - tilec->x0)] = tmp<0?(tmp>>1)+1:(tmp>>1);
       }
          }
        } else {      /* if (tcp->tccps[compno].qmfbid == 0) */