From 6ac77f5bdd3933cd08bc9746c1f5e724dcb255bd Mon Sep 17 00:00:00 2001
From: malaterre <malaterre>
Date: Fri, 4 Nov 2005 15:05:10 +0000
Subject: [PATCH] ENH: Apply patch from Antonin

---
 src/gdcmopenjpeg/libopenjpeg/j2k.h | 2 +-
 src/gdcmopenjpeg/libopenjpeg/t1.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gdcmopenjpeg/libopenjpeg/j2k.h b/src/gdcmopenjpeg/libopenjpeg/j2k.h
index c6a66b29..b42ecf80 100644
--- 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 6af547a2..fee3315d 100644
--- 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) */
-- 
2.46.1