From 6045158ce611504f6359256926f69b6043ec50ea Mon Sep 17 00:00:00 2001
From: Parvatha Elangovan <p.elangovan@intopix.com>
Date: Wed, 21 Mar 2007 13:01:15 +0000
Subject: [PATCH] Fixed j2k_prog_order_list[]. Modifications in j2k.c. Fixed
 t1_decode_cblks. Modifications in t1.c.

---
 ChangeLog         | 4 ++++
 libopenjpeg/j2k.c | 3 ++-
 libopenjpeg/t1.c  | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 111ae5af..267b6128 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+March 21, 2007
+* [Parvatha] Fixed j2k_prog_order_list[]. Modifications in j2k.c.
+* [Parvatha] Fixed t1_decode_cblks. Modifications in t1.c.
+
 March 20, 2007
 + [Parvatha] Added feature for generation of tile parts. Modifications in image_to_j2k.c, openjpeg.c, j2k.c, pi.c
 + [Parvatha] Added function j2k_write_tlm(),to generate TLM marker for a Digital cinema compliant codestream. Modifications in j2k.c.
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index 3768a110..f8c5a3e0 100644
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -244,7 +244,8 @@ j2k_prog_order_t j2k_prog_order_list[] = {
 	{LRCP, "LRCP"},
 	{PCRL, "PCRL"},
 	{RLCP, "RLCP"},
-	{RPCL, "RPCL"}
+	{RPCL, "RPCL"},
+	{-1, NULL}
 };
 
 char *convert_progression_order(OPJ_PROG_ORDER prg_order){
diff --git a/libopenjpeg/t1.c b/libopenjpeg/t1.c
index 87a29594..da93834a 100644
--- a/libopenjpeg/t1.c
+++ b/libopenjpeg/t1.c
@@ -1064,7 +1064,7 @@ void t1_decode_cblks(opj_t1_t *t1, opj_tcd_tile_t *tile, opj_tcp_t *tcp) {
 									if (t1->data[j][i] >> 1 == 0) {
 										tilec->data[x + i + (y + j) * w] = 0;
 									} else {
-										double tmp = (double)((t1->data[j][i] << 12) * band->stepsize);
+										double tmp = (double)(t1->data[j][i] * band->stepsize * 4096.0);
 										int tmp2 = ((int) (floor(fabs(tmp)))) + ((int) floor(fabs(tmp*2))%2);
 										tilec->data[x + i + (y + j) * w] = ((tmp<0)?-tmp2:tmp2);
 									}