X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libopenjpeg%2Ft1.c;h=716f6b45bc79560795d6b39512ad50b4822ccc5c;hb=07be749bf2a8a1ae27f31b24b2eb132f5537b665;hp=d2f3f3552966ec0e3f585a849361499ca72d78a9;hpb=7d06d7fb5db82318686bad0b99951d6d612f6cca;p=openjpeg.git

diff --git a/libopenjpeg/t1.c b/libopenjpeg/t1.c
index d2f3f355..716f6b45 100644
--- a/libopenjpeg/t1.c
+++ b/libopenjpeg/t1.c
@@ -39,62 +39,146 @@
 /** @name Local static functions */
 /*@{*/
 
-static char t1_getctxno_zc(int f, int orient);
+static INLINE char t1_getctxno_zc(int f, int orient);
 static char t1_getctxno_sc(int f);
-static char t1_getctxno_mag(int f);
+static INLINE int t1_getctxno_mag(int f);
 static char t1_getspb(int f);
 static short t1_getnmsedec_sig(int x, int bitpos);
 static short t1_getnmsedec_ref(int x, int bitpos);
-static void t1_updateflags(flag_t *flagsp, int s);
+static void t1_updateflags(flag_t *flagsp, int s, int stride);
 /**
 Encode significant pass
 */
-static void t1_enc_sigpass_step(opj_t1_t *t1, flag_t *flagsp, int *dp, int orient, int bpno, int one, int *nmsedec, char type, int vsc);
+static void t1_enc_sigpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int orient,
+		int bpno,
+		int one,
+		int *nmsedec,
+		char type,
+		int vsc);
 /**
 Decode significant pass
 */
-static void t1_dec_sigpass_step(opj_t1_t *t1, flag_t *flagsp, int *dp, int orient, int oneplushalf, char type, int vsc);
+static void t1_dec_sigpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int orient,
+		int oneplushalf,
+		char type,
+		int vsc);
 /**
 Encode significant pass
 */
-static void t1_enc_sigpass(opj_t1_t *t1, int w, int h, int bpno, int orient, int *nmsedec, char type, int cblksty);
+static void t1_enc_sigpass(
+		opj_t1_t *t1,
+		int bpno,
+		int orient,
+		int *nmsedec,
+		char type,
+		int cblksty);
 /**
 Decode significant pass
 */
-static void t1_dec_sigpass(opj_t1_t *t1, int w, int h, int bpno, int orient, char type, int cblksty);
+static void t1_dec_sigpass(
+		opj_t1_t *t1,
+		int bpno,
+		int orient,
+		char type,
+		int cblksty);
 /**
 Encode refinement pass
 */
-static void t1_enc_refpass_step(opj_t1_t *t1, flag_t *flagsp, int *dp, int bpno, int one, int *nmsedec, char type, int vsc);
+static void t1_enc_refpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int bpno,
+		int one,
+		int *nmsedec,
+		char type,
+		int vsc);
 /**
 Decode refinement pass
 */
-static void t1_dec_refpass_step(opj_t1_t *t1, flag_t *flagsp, int *dp, int poshalf, int neghalf, char type, int vsc);
+static void t1_dec_refpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int poshalf,
+		int neghalf,
+		char type,
+		int vsc);
 /**
 Encode refinement pass
 */
-static void t1_enc_refpass(opj_t1_t *t1, int w, int h, int bpno, int *nmsedec, char type, int cblksty);
+static void t1_enc_refpass(
+		opj_t1_t *t1,
+		int bpno,
+		int *nmsedec,
+		char type,
+		int cblksty);
 /**
 Decode refinement pass
 */
-static void t1_dec_refpass(opj_t1_t *t1, int w, int h, int bpno, char type, int cblksty);
+static void t1_dec_refpass(
+		opj_t1_t *t1,
+		int bpno,
+		char type,
+		int cblksty);
 /**
 Encode clean-up pass
 */
-static void t1_enc_clnpass_step(opj_t1_t *t1, flag_t *flagsp, int *dp, int orient, int bpno, int one, int *nmsedec, int partial, int vsc);
+static void t1_enc_clnpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int orient,
+		int bpno,
+		int one,
+		int *nmsedec,
+		int partial,
+		int vsc);
 /**
 Decode clean-up pass
 */
-static void t1_dec_clnpass_step(opj_t1_t *t1, flag_t *flagsp, int *dp, int orient, int oneplushalf, int partial, int vsc);
+static void t1_dec_clnpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int orient,
+		int oneplushalf,
+		int partial,
+		int vsc);
 /**
 Encode clean-up pass
 */
-static void t1_enc_clnpass(opj_t1_t *t1, int w, int h, int bpno, int orient, int *nmsedec, int cblksty);
+static void t1_enc_clnpass(
+		opj_t1_t *t1,
+		int bpno,
+		int orient,
+		int *nmsedec,
+		int cblksty);
 /**
 Decode clean-up pass
 */
-static void t1_dec_clnpass(opj_t1_t *t1, int w, int h, int bpno, int orient, int cblksty);
-static double t1_getwmsedec(int nmsedec, int compno, int level, int orient, int bpno, int qmfbid, double stepsize, int numcomps);
+static void t1_dec_clnpass(
+		opj_t1_t *t1,
+		int bpno,
+		int orient,
+		int cblksty);
+static double t1_getwmsedec(
+		int nmsedec,
+		int compno,
+		int level,
+		int orient,
+		int bpno,
+		int qmfbid,
+		double stepsize,
+		int numcomps);
 /**
 Encode 1 code-block
 @param t1 T1 handle
@@ -108,7 +192,17 @@ Encode 1 code-block
 @param numcomps
 @param tile
 */
-static void t1_encode_cblk(opj_t1_t *t1, opj_tcd_cblk_t * cblk, int orient, int compno, int level, int qmfbid, double stepsize, int cblksty, int numcomps, opj_tcd_tile_t * tile);
+static void t1_encode_cblk(
+		opj_t1_t *t1,
+		opj_tcd_cblk_t * cblk,
+		int orient,
+		int compno,
+		int level,
+		int qmfbid,
+		double stepsize,
+		int cblksty,
+		int numcomps,
+		opj_tcd_tile_t * tile);
 /**
 Decode 1 code-block
 @param t1 T1 handle
@@ -117,7 +211,12 @@ Decode 1 code-block
 @param roishift Region of interest shifting value
 @param cblksty Code-block style
 */
-static void t1_decode_cblk(opj_t1_t *t1, opj_tcd_cblk_t * cblk, int orient, int roishift, int cblksty);
+static void t1_decode_cblk(
+		opj_t1_t *t1,
+		opj_tcd_cblk_t * cblk,
+		int orient,
+		int roishift,
+		int cblksty);
 
 /*@}*/
 
@@ -133,8 +232,10 @@ static char t1_getctxno_sc(int f) {
 	return lut_ctxno_sc[(f & (T1_SIG_PRIM | T1_SGN)) >> 4];
 }
 
-static char t1_getctxno_mag(int f) {
-	return lut_ctxno_mag[(f & T1_SIG_OTH) | (((f & T1_REFINE) != 0) << 11)];
+static int t1_getctxno_mag(int f) {
+	int tmp1 = (f & T1_SIG_OTH) ? T1_CTXNO_MAG + 1 : T1_CTXNO_MAG;
+	int tmp2 = (f & T1_REFINE) ? T1_CTXNO_MAG + 2 : tmp1;
+	return (tmp2);
 }
 
 static char t1_getspb(int f) {
@@ -157,58 +258,78 @@ static short t1_getnmsedec_ref(int x, int bitpos) {
     return lut_nmsedec_ref0[x & ((1 << T1_NMSEDEC_BITS) - 1)];
 }
 
-static void t1_updateflags(flag_t *flagsp, int s) {
-	flag_t *np = flagsp - (T1_MAXCBLKW + 2);
-	flag_t *sp = flagsp + (T1_MAXCBLKW + 2);
+static void t1_updateflags(flag_t *flagsp, int s, int stride) {
+	flag_t *np = flagsp - stride;
+	flag_t *sp = flagsp + stride;
+
+	static const flag_t mod[] = {
+		T1_SIG_S, T1_SIG_S|T1_SGN_S,
+		T1_SIG_E, T1_SIG_E|T1_SGN_E,
+		T1_SIG_W, T1_SIG_W|T1_SGN_W,
+		T1_SIG_N, T1_SIG_N|T1_SGN_N
+	};
+
 	np[-1] |= T1_SIG_SE;
-	np[1] |= T1_SIG_SW;
+	np[0]  |= mod[s];
+	np[1]  |= T1_SIG_SW;
+
+	flagsp[-1] |= mod[s+2];
+	flagsp[0]  |= T1_SIG;
+	flagsp[1]  |= mod[s+4];
+
 	sp[-1] |= T1_SIG_NE;
-	sp[1] |= T1_SIG_NW;
-	*np |= T1_SIG_S;
-	*sp |= T1_SIG_N;
-	flagsp[-1] |= T1_SIG_E;
-	flagsp[1] |= T1_SIG_W;
-	if (s) {
-		*np |= T1_SGN_S;
-		*sp |= T1_SGN_N;
-		flagsp[-1] |= T1_SGN_E;
-		flagsp[1] |= T1_SGN_W;
-	}
+	sp[0]  |= mod[s+6];
+	sp[1]  |= T1_SIG_NW;
 }
 
-static void t1_enc_sigpass_step(opj_t1_t *t1, flag_t *flagsp, int *dp, int orient, int bpno, int one, int *nmsedec, char type, int vsc) {
+static void t1_enc_sigpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int orient,
+		int bpno,
+		int one,
+		int *nmsedec,
+		char type,
+		int vsc)
+{
 	int v, flag;
 	
 	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
 	
 	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
 	if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
-		v = int_abs(*dp) & one ? 1 : 0;
+		v = int_abs(*datap) & one ? 1 : 0;
+		mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));	/* ESSAI */
 		if (type == T1_TYPE_RAW) {	/* BYPASS/LAZY MODE */
-			mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));	/* ESSAI */
 			mqc_bypass_enc(mqc, v);
 		} else {
-			mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
 			mqc_encode(mqc, v);
 		}
 		if (v) {
-			v = *dp < 0 ? 1 : 0;
-			*nmsedec +=	t1_getnmsedec_sig(int_abs(*dp), bpno + T1_NMSEDEC_FRACBITS);
+			v = *datap < 0 ? 1 : 0;
+			*nmsedec +=	t1_getnmsedec_sig(int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS);
+			mqc_setcurctx(mqc, t1_getctxno_sc(flag));	/* ESSAI */
 			if (type == T1_TYPE_RAW) {	/* BYPASS/LAZY MODE */
-				mqc_setcurctx(mqc, t1_getctxno_sc(flag));	/* ESSAI */
 				mqc_bypass_enc(mqc, v);
 			} else {
-				mqc_setcurctx(mqc, t1_getctxno_sc(flag));
 				mqc_encode(mqc, v ^ t1_getspb(flag));
 			}
-			t1_updateflags(flagsp, v);
-			*flagsp |= T1_SIG;
+			t1_updateflags(flagsp, v, t1->flags_stride);
 		}
 		*flagsp |= T1_VISIT;
 	}
 }
 
-static void t1_dec_sigpass_step(opj_t1_t *t1, flag_t *flagsp, int *dp, int orient, int oneplushalf, char type, int vsc) {
+static void t1_dec_sigpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int orient,
+		int oneplushalf,
+		char type,
+		int vsc)
+{
 	int v, flag;
 	
 	opj_raw_t *raw = t1->raw;	/* RAW component */
@@ -219,74 +340,117 @@ static void t1_dec_sigpass_step(opj_t1_t *t1, flag_t *flagsp, int *dp, int orien
 		if (type == T1_TYPE_RAW) {
 			if (raw_decode(raw)) {
 				v = raw_decode(raw);	/* ESSAI */
-				*dp = v ? -oneplushalf : oneplushalf;
-				t1_updateflags(flagsp, v);
-				*flagsp |= T1_SIG;
+				*datap = v ? -oneplushalf : oneplushalf;
+				t1_updateflags(flagsp, v, t1->flags_stride);
 			}
 		} else {
 			mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
 			if (mqc_decode(mqc)) {
 				mqc_setcurctx(mqc, t1_getctxno_sc(flag));
 				v = mqc_decode(mqc) ^ t1_getspb(flag);
-				*dp = v ? -oneplushalf : oneplushalf;
-				t1_updateflags(flagsp, v);
-				*flagsp |= T1_SIG;
+				*datap = v ? -oneplushalf : oneplushalf;
+				t1_updateflags(flagsp, v, t1->flags_stride);
 			}
 		}
 		*flagsp |= T1_VISIT;
 	}
 }				/* VSC and  BYPASS by Antonin */
 
-static void t1_enc_sigpass(opj_t1_t *t1, int w, int h, int bpno, int orient, int *nmsedec, char type, int cblksty) {
+static void t1_enc_sigpass(
+		opj_t1_t *t1,
+		int bpno,
+		int orient,
+		int *nmsedec,
+		char type,
+		int cblksty)
+{
 	int i, j, k, one, vsc;
 	*nmsedec = 0;
 	one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
-	for (k = 0; k < h; k += 4) {
-		for (i = 0; i < w; i++) {
-			for (j = k; j < k + 4 && j < h; j++) {
-				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == h - 1)) ? 1 : 0;
-				t1_enc_sigpass_step(t1, &t1->flags[1 + j][1 + i], &t1->data[j][i], orient, bpno, one, nmsedec, type, vsc);
+	for (k = 0; k < t1->h; k += 4) {
+		for (i = 0; i < t1->w; ++i) {
+			for (j = k; j < k + 4 && j < t1->h; ++j) {
+				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+				t1_enc_sigpass_step(
+						t1,
+						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->data[(j * t1->w) + i],
+						orient,
+						bpno,
+						one,
+						nmsedec,
+						type,
+						vsc);
 			}
 		}
 	}
 }
 
-static void t1_dec_sigpass(opj_t1_t *t1, int w, int h, int bpno, int orient, char type, int cblksty) {
+static void t1_dec_sigpass(
+		opj_t1_t *t1,
+		int bpno,
+		int orient,
+		char type,
+		int cblksty)
+{
 	int i, j, k, one, half, oneplushalf, vsc;
 	one = 1 << bpno;
 	half = one >> 1;
 	oneplushalf = one | half;
-	for (k = 0; k < h; k += 4) {
-		for (i = 0; i < w; i++) {
-			for (j = k; j < k + 4 && j < h; j++) {
-				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == h - 1)) ? 1 : 0;
-				t1_dec_sigpass_step(t1, &t1->flags[1 + j][1 + i], &t1->data[j][i], orient, oneplushalf, type, vsc);
+	for (k = 0; k < t1->h; k += 4) {
+		for (i = 0; i < t1->w; ++i) {
+			for (j = k; j < k + 4 && j < t1->h; ++j) {
+				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+				t1_dec_sigpass_step(
+						t1,
+						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->data[(j * t1->w) + i],
+						orient,
+						oneplushalf,
+						type,
+						vsc);
 			}
 		}
 	}
 }				/* VSC and  BYPASS by Antonin */
 
-static void t1_enc_refpass_step(opj_t1_t *t1, flag_t *flagsp, int *dp, int bpno, int one, int *nmsedec, char type, int vsc) {
+static void t1_enc_refpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int bpno,
+		int one,
+		int *nmsedec,
+		char type,
+		int vsc)
+{
 	int v, flag;
 	
 	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
 	
 	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
 	if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
-		*nmsedec += t1_getnmsedec_ref(int_abs(*dp), bpno + T1_NMSEDEC_FRACBITS);
-		v = int_abs(*dp) & one ? 1 : 0;
+		*nmsedec += t1_getnmsedec_ref(int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS);
+		v = int_abs(*datap) & one ? 1 : 0;
+		mqc_setcurctx(mqc, t1_getctxno_mag(flag));	/* ESSAI */
 		if (type == T1_TYPE_RAW) {	/* BYPASS/LAZY MODE */
-			mqc_setcurctx(mqc, t1_getctxno_mag(flag));	/* ESSAI */
 			mqc_bypass_enc(mqc, v);
 		} else {
-			mqc_setcurctx(mqc, t1_getctxno_mag(flag));
 			mqc_encode(mqc, v);
 		}
 		*flagsp |= T1_REFINE;
 	}
 }
 
-static void t1_dec_refpass_step(opj_t1_t *t1, flag_t *flagsp, int *dp, int poshalf, int neghalf, char type, int vsc) {
+static void t1_dec_refpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int poshalf,
+		int neghalf,
+		char type,
+		int vsc)
+{
 	int v, t, flag;
 	
 	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
@@ -294,50 +458,85 @@ static void t1_dec_refpass_step(opj_t1_t *t1, flag_t *flagsp, int *dp, int posha
 	
 	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
 	if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
+		mqc_setcurctx(mqc, t1_getctxno_mag(flag));	/* ESSAI */
 		if (type == T1_TYPE_RAW) {
-			mqc_setcurctx(mqc, t1_getctxno_mag(flag));	/* ESSAI */
 			v = raw_decode(raw);
 		} else {
-			mqc_setcurctx(mqc, t1_getctxno_mag(flag));
 			v = mqc_decode(mqc);
 		}
 		t = v ? poshalf : neghalf;
-		*dp += *dp < 0 ? -t : t;
+		*datap += *datap < 0 ? -t : t;
 		*flagsp |= T1_REFINE;
 	}
 }				/* VSC and  BYPASS by Antonin  */
 
-static void t1_enc_refpass(opj_t1_t *t1, int w, int h, int bpno, int *nmsedec, char type, int cblksty) {
+static void t1_enc_refpass(
+		opj_t1_t *t1,
+		int bpno,
+		int *nmsedec,
+		char type,
+		int cblksty)
+{
 	int i, j, k, one, vsc;
 	*nmsedec = 0;
 	one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
-	for (k = 0; k < h; k += 4) {
-		for (i = 0; i < w; i++) {
-			for (j = k; j < k + 4 && j < h; j++) {
-				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == h - 1)) ? 1 : 0;
-				t1_enc_refpass_step(t1, &t1->flags[1 + j][1 + i], &t1->data[j][i], bpno, one, nmsedec, type, vsc);
+	for (k = 0; k < t1->h; k += 4) {
+		for (i = 0; i < t1->w; ++i) {
+			for (j = k; j < k + 4 && j < t1->h; ++j) {
+				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+				t1_enc_refpass_step(
+						t1,
+						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->data[(j * t1->w) + i],
+						bpno,
+						one,
+						nmsedec,
+						type,
+						vsc);
 			}
 		}
 	}
 }
 
-static void t1_dec_refpass(opj_t1_t *t1, int w, int h, int bpno, char type, int cblksty) {
+static void t1_dec_refpass(
+		opj_t1_t *t1,
+		int bpno,
+		char type,
+		int cblksty)
+{
 	int i, j, k, one, poshalf, neghalf;
 	int vsc;
 	one = 1 << bpno;
 	poshalf = one >> 1;
 	neghalf = bpno > 0 ? -poshalf : -1;
-	for (k = 0; k < h; k += 4) {
-		for (i = 0; i < w; i++) {
-			for (j = k; j < k + 4 && j < h; j++) {
-				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == h - 1)) ? 1 : 0;
-				t1_dec_refpass_step(t1, &t1->flags[1 + j][1 + i], &t1->data[j][i], poshalf, neghalf, type, vsc);
+	for (k = 0; k < t1->h; k += 4) {
+		for (i = 0; i < t1->w; ++i) {
+			for (j = k; j < k + 4 && j < t1->h; ++j) {
+				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+				t1_dec_refpass_step(
+						t1,
+						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->data[(j * t1->w) + i],
+						poshalf,
+						neghalf,
+						type,
+						vsc);
 			}
 		}
 	}
 }				/* VSC and  BYPASS by Antonin */
 
-static void t1_enc_clnpass_step(opj_t1_t *t1, flag_t *flagsp, int *dp, int orient, int bpno, int one, int *nmsedec, int partial, int vsc) {
+static void t1_enc_clnpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int orient,
+		int bpno,
+		int one,
+		int *nmsedec,
+		int partial,
+		int vsc)
+{
 	int v, flag;
 	
 	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
@@ -348,22 +547,29 @@ static void t1_enc_clnpass_step(opj_t1_t *t1, flag_t *flagsp, int *dp, int orien
 	}
 	if (!(*flagsp & (T1_SIG | T1_VISIT))) {
 		mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
-		v = int_abs(*dp) & one ? 1 : 0;
+		v = int_abs(*datap) & one ? 1 : 0;
 		mqc_encode(mqc, v);
 		if (v) {
 LABEL_PARTIAL:
-			*nmsedec += t1_getnmsedec_sig(int_abs(*dp), bpno + T1_NMSEDEC_FRACBITS);
+			*nmsedec += t1_getnmsedec_sig(int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS);
 			mqc_setcurctx(mqc, t1_getctxno_sc(flag));
-			v = *dp < 0 ? 1 : 0;
+			v = *datap < 0 ? 1 : 0;
 			mqc_encode(mqc, v ^ t1_getspb(flag));
-			t1_updateflags(flagsp, v);
-			*flagsp |= T1_SIG;
+			t1_updateflags(flagsp, v, t1->flags_stride);
 		}
 	}
 	*flagsp &= ~T1_VISIT;
 }
 
-static void t1_dec_clnpass_step(opj_t1_t *t1, flag_t *flagsp, int *dp, int orient, int oneplushalf, int partial, int vsc) {
+static void t1_dec_clnpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int orient,
+		int oneplushalf,
+		int partial,
+		int vsc)
+{
 	int v, flag;
 	
 	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
@@ -378,42 +584,47 @@ static void t1_dec_clnpass_step(opj_t1_t *t1, flag_t *flagsp, int *dp, int orien
 LABEL_PARTIAL:
 			mqc_setcurctx(mqc, t1_getctxno_sc(flag));
 			v = mqc_decode(mqc) ^ t1_getspb(flag);
-			*dp = v ? -oneplushalf : oneplushalf;
-			t1_updateflags(flagsp, v);
-			*flagsp |= T1_SIG;
+			*datap = v ? -oneplushalf : oneplushalf;
+			t1_updateflags(flagsp, v, t1->flags_stride);
 		}
 	}
 	*flagsp &= ~T1_VISIT;
 }				/* VSC and  BYPASS by Antonin */
 
-static void t1_enc_clnpass(opj_t1_t *t1, int w, int h, int bpno, int orient, int *nmsedec, int cblksty) {
+static void t1_enc_clnpass(
+		opj_t1_t *t1,
+		int bpno,
+		int orient,
+		int *nmsedec,
+		int cblksty)
+{
 	int i, j, k, one, agg, runlen, vsc;
 	
 	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
 	
 	*nmsedec = 0;
 	one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
-	for (k = 0; k < h; k += 4) {
-		for (i = 0; i < w; i++) {
-			if (k + 3 < h) {
+	for (k = 0; k < t1->h; k += 4) {
+		for (i = 0; i < t1->w; ++i) {
+			if (k + 3 < t1->h) {
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(t1->flags[1 + k][1 + i] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| t1->flags[1 + k + 1][1 + i] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| t1->flags[1 + k + 2][1 + i] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| (t1->flags[1 + k + 3][1 + i] 
+					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| (MACRO_t1_flags(1 + k + 3,1 + i) 
 						& (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |	T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				} else {
-					agg = !(t1->flags[1 + k][1 + i] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| t1->flags[1 + k + 1][1 + i] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| t1->flags[1 + k + 2][1 + i] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| t1->flags[1 + k + 3][1 + i] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				}
 			} else {
 				agg = 0;
 			}
 			if (agg) {
-				for (runlen = 0; runlen < 4; runlen++) {
-					if (int_abs(t1->data[k + runlen][i]) & one)
+				for (runlen = 0; runlen < 4; ++runlen) {
+					if (int_abs(t1->data[((k + runlen)*t1->w) + i]) & one)
 						break;
 				}
 				mqc_setcurctx(mqc, T1_CTXNO_AGG);
@@ -427,15 +638,29 @@ static void t1_enc_clnpass(opj_t1_t *t1, int w, int h, int bpno, int orient, int
 			} else {
 				runlen = 0;
 			}
-			for (j = k + runlen; j < k + 4 && j < h; j++) {
-				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == h - 1)) ? 1 : 0;
-				t1_enc_clnpass_step(t1, &t1->flags[1 + j][1 + i], &t1->data[j][i], orient, bpno, one, nmsedec, agg && (j == k + runlen), vsc);
+			for (j = k + runlen; j < k + 4 && j < t1->h; ++j) {
+				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+				t1_enc_clnpass_step(
+						t1,
+						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->data[(j * t1->w) + i],
+						orient,
+						bpno,
+						one,
+						nmsedec,
+						agg && (j == k + runlen),
+						vsc);
 			}
 		}
 	}
 }
 
-static void t1_dec_clnpass(opj_t1_t *t1, int w, int h, int bpno, int orient, int cblksty) {
+static void t1_dec_clnpass(
+		opj_t1_t *t1,
+		int bpno,
+		int orient,
+		int cblksty)
+{
 	int i, j, k, one, half, oneplushalf, agg, runlen, vsc;
 	int segsym = cblksty & J2K_CCP_CBLKSTY_SEGSYM;
 	
@@ -444,20 +669,20 @@ static void t1_dec_clnpass(opj_t1_t *t1, int w, int h, int bpno, int orient, int
 	one = 1 << bpno;
 	half = one >> 1;
 	oneplushalf = one | half;
-	for (k = 0; k < h; k += 4) {
-		for (i = 0; i < w; i++) {
-			if (k + 3 < h) {
+	for (k = 0; k < t1->h; k += 4) {
+		for (i = 0; i < t1->w; ++i) {
+			if (k + 3 < t1->h) {
 				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(t1->flags[1 + k][1 + i] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| t1->flags[1 + k + 1][1 + i] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| t1->flags[1 + k + 2][1 + i] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| (t1->flags[1 + k + 3][1 + i] 
+					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| (MACRO_t1_flags(1 + k + 3,1 + i) 
 						& (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |	T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				} else {
-					agg = !(t1->flags[1 + k][1 + i] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| t1->flags[1 + k + 1][1 + i] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| t1->flags[1 + k + 2][1 + i] & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| t1->flags[1 + k + 3][1 + i] & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
 				}
 			} else {
 				agg = 0;
@@ -473,9 +698,16 @@ static void t1_dec_clnpass(opj_t1_t *t1, int w, int h, int bpno, int orient, int
 			} else {
 				runlen = 0;
 			}
-			for (j = k + runlen; j < k + 4 && j < h; j++) {
-				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == h - 1)) ? 1 : 0;
-				t1_dec_clnpass_step(t1, &t1->flags[1 + j][1 + i], &t1->data[j][i], orient, oneplushalf, agg && (j == k + runlen), vsc);
+			for (j = k + runlen; j < k + 4 && j < t1->h; ++j) {
+				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+				t1_dec_clnpass_step(
+						t1,
+						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->data[(j * t1->w) + i],
+						orient,
+						oneplushalf,
+						agg && (j == k + runlen),
+						vsc);
 			}
 		}
 	}
@@ -496,13 +728,22 @@ static void t1_dec_clnpass(opj_t1_t *t1, int w, int h, int bpno, int orient, int
 
 
 /** mod fixed_quality */
-static double t1_getwmsedec(int nmsedec, int compno, int level, int orient, int bpno, int qmfbid, double stepsize, int numcomps)	{
+static double t1_getwmsedec(
+		int nmsedec,
+		int compno,
+		int level,
+		int orient,
+		int bpno,
+		int qmfbid,
+		double stepsize,
+		int numcomps)
+{
 	double w1, w2, wmsedec;
 	if (qmfbid == 1) {
-		w1 = (numcomps > 1) ? mct_getnorm(compno) : 1;
+		w1 = (numcomps > 1) ? mct_getnorm(compno) : 1.0;
 		w2 = dwt_getnorm(level, orient);
 	} else {			/* if (qmfbid == 0) */
-		w1 = (numcomps > 1) ? mct_getnorm_real(compno) : 1;
+		w1 = (numcomps > 1) ? mct_getnorm_real(compno) : 1.0;
 		w2 = dwt_getnorm_real(level, orient);
 	}
 	wmsedec = w1 * w2 * stepsize * (1 << bpno);
@@ -511,35 +752,75 @@ static double t1_getwmsedec(int nmsedec, int compno, int level, int orient, int
 	return wmsedec;
 }
 
+static bool allocate_buffers(
+		opj_t1_t *t1,
+		int w,
+		int h)
+{
+	int datasize=w * h;
+	int flagssize;
+
+	if(datasize > t1->datasize){
+		opj_aligned_free(t1->data);
+		t1->data=opj_aligned_malloc(datasize * sizeof(int));
+		if(!t1->data){
+			return false;
+		}
+		t1->datasize=datasize;
+	}
+	memset(t1->data,0,datasize * sizeof(int));
+
+	t1->flags_stride=w+2;
+	flagssize=t1->flags_stride * (h+2);
+
+	if(flagssize > t1->flagssize){
+		opj_aligned_free(t1->flags);
+		t1->flags=opj_aligned_malloc(flagssize * sizeof(flag_t));
+		if(!t1->flags){
+			return false;
+		}
+		t1->flagssize=flagssize;
+	}
+	memset(t1->flags,0,flagssize * sizeof(flag_t));
+
+	t1->w=w;
+	t1->h=h;
+
+	return true;
+}
+
 /** mod fixed_quality */
-static void t1_encode_cblk(opj_t1_t *t1, opj_tcd_cblk_t * cblk, int orient, int compno, int level, int qmfbid, double stepsize, int cblksty, int numcomps, opj_tcd_tile_t * tile) {
+static void t1_encode_cblk(
+		opj_t1_t *t1,
+		opj_tcd_cblk_t * cblk,
+		int orient,
+		int compno,
+		int level,
+		int qmfbid,
+		double stepsize,
+		int cblksty,
+		int numcomps,
+		opj_tcd_tile_t * tile)
+{
 	int i, j;
-	int w, h;
 	int passno;
 	int bpno, passtype;
 	int max;
 	int nmsedec = 0;
-	double cumwmsedec = 0;
+	double cumwmsedec = 0.0;
 	char type = T1_TYPE_MQ;
 	
 	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
 	
-	w = cblk->x1 - cblk->x0;
-	h = cblk->y1 - cblk->y0;
-	
 	max = 0;
-	for (j = 0; j < h; j++) {
-		for (i = 0; i < w; i++) {
-			max = int_max(max, int_abs(t1->data[j][i]));
+	for (j = 0; j < t1->h; ++j) {
+		for (i = 0; i < t1->w; ++i) {
+			max = int_max(max, int_abs(t1->data[(j * t1->w) + i]));
 		}
 	}
 	
 	cblk->numbps = max ? (int_floorlog2(max) + 1) - T1_NMSEDEC_FRACBITS : 0;
 	
-	for (i = 0; i <= h; ++i) {
-		memset(&t1->flags[i], 0, (w+1) * sizeof(flag_t));
- 	}
-	
 	bpno = cblk->numbps - 1;
 	passtype = 2;
 	
@@ -549,20 +830,20 @@ static void t1_encode_cblk(opj_t1_t *t1, opj_tcd_cblk_t * cblk, int orient, int
 	mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
 	mqc_init_enc(mqc, cblk->data);
 	
-	for (passno = 0; bpno >= 0; passno++) {
+	for (passno = 0; bpno >= 0; ++passno) {
 		opj_tcd_pass_t *pass = &cblk->passes[passno];
 		int correction = 3;
 		type = ((bpno < (cblk->numbps - 4)) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
 		
 		switch (passtype) {
 			case 0:
-				t1_enc_sigpass(t1, w, h, bpno, orient, &nmsedec, type, cblksty);
+				t1_enc_sigpass(t1, bpno, orient, &nmsedec, type, cblksty);
 				break;
 			case 1:
-				t1_enc_refpass(t1, w, h, bpno, &nmsedec, type, cblksty);
+				t1_enc_refpass(t1, bpno, &nmsedec, type, cblksty);
 				break;
 			case 2:
-				t1_enc_clnpass(t1, w, h, bpno, orient, &nmsedec, cblksty);
+				t1_enc_clnpass(t1, bpno, orient, &nmsedec, cblksty);
 				/* code switch SEGMARK (i.e. SEGSYM) */
 				if (cblksty & J2K_CCP_CBLKSTY_SEGSYM)
 					mqc_segmark_enc(mqc);
@@ -642,26 +923,28 @@ static void t1_encode_cblk(opj_t1_t *t1, opj_tcd_cblk_t * cblk, int orient, int
 	}
 }
 
-static void t1_decode_cblk(opj_t1_t *t1, opj_tcd_cblk_t * cblk, int orient, int roishift, int cblksty) {
-	int i, w, h;
+static void t1_decode_cblk(
+		opj_t1_t *t1,
+		opj_tcd_cblk_t * cblk,
+		int orient,
+		int roishift,
+		int cblksty)
+{
 	int bpno, passtype;
 	int segno, passno;
 	char type = T1_TYPE_MQ; /* BYPASS mode */
 	
 	opj_raw_t *raw = t1->raw;	/* RAW component */
 	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	w = cblk->x1 - cblk->x0;
-	h = cblk->y1 - cblk->y0;
-	
-	for (i = 0; i <= h; ++i) {
-		memset(&t1->flags[i], 0, (w + 1) * sizeof(flag_t));
- 	}
-	
-	for (i = 0; i < h; ++i) {
-		memset(&t1->data[i], 0, w * sizeof(int));
- 	}
-	
+
+	if(!allocate_buffers(
+				t1,
+				cblk->x1 - cblk->x0,
+				cblk->y1 - cblk->y0))
+	{
+		return;
+	}
+
 	bpno = roishift + cblk->numbps - 1;
 	passtype = 2;
 	
@@ -670,7 +953,7 @@ static void t1_decode_cblk(opj_t1_t *t1, opj_tcd_cblk_t * cblk, int orient, int
 	mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
 	mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
 	
-	for (segno = 0; segno < cblk->numsegs; segno++) {
+	for (segno = 0; segno < cblk->numsegs; ++segno) {
 		opj_tcd_seg_t *seg = &cblk->segs[segno];
 		
 		/* BYPASS mode */
@@ -681,16 +964,16 @@ static void t1_decode_cblk(opj_t1_t *t1, opj_tcd_cblk_t * cblk, int orient, int
 			mqc_init_dec(mqc, seg->data, seg->len);
 		}
 		
-		for (passno = 0; passno < seg->numpasses; passno++) {
+		for (passno = 0; passno < seg->numpasses; ++passno) {
 			switch (passtype) {
 				case 0:
-					t1_dec_sigpass(t1, w, h, bpno+1, orient, type, cblksty);
+					t1_dec_sigpass(t1, bpno+1, orient, type, cblksty);
 					break;
 				case 1:
-					t1_dec_refpass(t1, w, h, bpno+1, type, cblksty);
+					t1_dec_refpass(t1, bpno+1, type, cblksty);
 					break;
 				case 2:
-					t1_dec_clnpass(t1, w, h, bpno+1, orient, cblksty);
+					t1_dec_clnpass(t1, bpno+1, orient, cblksty);
 					break;
 			}
 			
@@ -711,13 +994,20 @@ static void t1_decode_cblk(opj_t1_t *t1, opj_tcd_cblk_t * cblk, int orient, int
 /* ----------------------------------------------------------------------- */
 
 opj_t1_t* t1_create(opj_common_ptr cinfo) {
-	opj_t1_t *t1 = (opj_t1_t*)opj_malloc(sizeof(opj_t1_t));
-	if(t1) {
+	opj_t1_t *t1 = (opj_t1_t*) malloc(sizeof(opj_t1_t));
+	if(!t1)
+		return NULL;
+
 		t1->cinfo = cinfo;
 		/* create MQC and RAW handles */
 		t1->mqc = mqc_create();
 		t1->raw = raw_create();
-	}
+
+	t1->datasize=0;
+	t1->data=NULL;
+	t1->flagssize=0;
+	t1->flags=NULL;
+
 	return t1;
 }
 
@@ -726,29 +1016,35 @@ void t1_destroy(opj_t1_t *t1) {
 		/* destroy MQC and RAW handles */
 		mqc_destroy(t1->mqc);
 		raw_destroy(t1->raw);
-		opj_free(t1);
+		opj_aligned_free(t1->data);
+		opj_aligned_free(t1->flags);
+		free(t1);
 	}
 }
 
-void t1_encode_cblks(opj_t1_t *t1, opj_tcd_tile_t *tile, opj_tcp_t *tcp) {
+void t1_encode_cblks(
+		opj_t1_t *t1,
+		opj_tcd_tile_t *tile,
+		opj_tcp_t *tcp)
+{
 	int compno, resno, bandno, precno, cblkno;
 
 	tile->distotile = 0;		/* fixed_quality */
 
-	for (compno = 0; compno < tile->numcomps; compno++) {
+	for (compno = 0; compno < tile->numcomps; ++compno) {
 		opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
 
-		for (resno = 0; resno < tilec->numresolutions; resno++) {
+		for (resno = 0; resno < tilec->numresolutions; ++resno) {
 			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
 
-			for (bandno = 0; bandno < res->numbands; bandno++) {
+			for (bandno = 0; bandno < res->numbands; ++bandno) {
 				opj_tcd_band_t *band = &res->bands[bandno];
 
-				for (precno = 0; precno < res->pw * res->ph; precno++) {
+				for (precno = 0; precno < res->pw * res->ph; ++precno) {
 					opj_tcd_precinct_t *prc = &band->precincts[precno];
 
-					for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-						int x, y, w, i, j, orient;
+					for (cblkno = 0; cblkno < prc->cw * prc->ch; ++cblkno) {
+						int x, y, w, i, j;
 						opj_tcd_cblk_t *cblk = &prc->cblks[cblkno];
 
 						x = cblk->x0 - band->x0;
@@ -761,33 +1057,45 @@ void t1_encode_cblks(opj_t1_t *t1, opj_tcd_tile_t *tile, opj_tcp_t *tcp) {
 							opj_tcd_resolution_t *pres = &tilec->resolutions[resno - 1];
 							y += pres->y1 - pres->y0;
 						}
-						
+
+						if(!allocate_buffers(
+									t1,
+									cblk->x1 - cblk->x0,
+									cblk->y1 - cblk->y0))
+						{
+							return;
+						}
+
 						w = tilec->x1 - tilec->x0;
 						if (tcp->tccps[compno].qmfbid == 1) {
-							for (j = 0; j < cblk->y1 - cblk->y0; j++) {
-								for (i = 0; i < cblk->x1 - cblk->x0; i++) {
-									t1->data[j][i] = 
+							for (j = 0; j < t1->h; ++j) {
+								for (i = 0; i < t1->w; ++i) {
+									t1->data[(j * t1->w) + i] =
 										tilec->data[(x + i) + (y + j) * w] << T1_NMSEDEC_FRACBITS;
 								}
 							}
 						} else {		/* if (tcp->tccps[compno].qmfbid == 0) */
-							for (j = 0; j < cblk->y1 - cblk->y0; j++) {
-								for (i = 0; i < cblk->x1 - cblk->x0; i++) {
-									t1->data[j][i] = 
+							for (j = 0; j < t1->h; ++j) {
+								for (i = 0; i < t1->w; ++i) {
+									t1->data[(j * t1->w) + i] = 
 										fix_mul(
 										tilec->data[x + i + (y + j) * w],
-										8192 * 8192 / ((int) floor(band->stepsize * 8192))) >> (13 - T1_NMSEDEC_FRACBITS);
+										8192 * 8192 / ((int) floor(band->stepsize * 8192))) >> (11 - T1_NMSEDEC_FRACBITS);
 								}
 							}
 						}
-						orient = band->bandno;	/* FIXME */
-						if (orient == 2) {
-							orient = 1;
-						} else if (orient == 1) {
-							orient = 2;
-						}
 
-						t1_encode_cblk(t1, cblk, orient, compno, tilec->numresolutions - 1 - resno, tcp->tccps[compno].qmfbid, band->stepsize, tcp->tccps[compno].cblksty, tile->numcomps, tile);
+						t1_encode_cblk(
+								t1,
+								cblk,
+								band->bandno,
+								compno,
+								tilec->numresolutions - 1 - resno,
+								tcp->tccps[compno].qmfbid,
+								band->stepsize,
+								tcp->tccps[compno].cblksty,
+								tile->numcomps,
+								tile);
 
 					} /* cblkno */
 				} /* precno */
@@ -796,33 +1104,35 @@ void t1_encode_cblks(opj_t1_t *t1, opj_tcd_tile_t *tile, opj_tcp_t *tcp) {
 	} /* compno  */
 }
 
-void t1_decode_cblks(opj_t1_t *t1, opj_tcd_tile_t *tile, opj_tcp_t *tcp) {
+void t1_decode_cblks(
+		opj_t1_t *t1,
+		opj_tcd_tile_t *tile,
+		opj_tcp_t *tcp)
+{
 	int compno, resno, bandno, precno, cblkno;
 
-	for (compno = 0; compno < tile->numcomps; compno++) {
+	for (compno = 0; compno < tile->numcomps; ++compno) {
 		opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
 
-		for (resno = 0; resno < tilec->numresolutions; resno++) {
+		for (resno = 0; resno < tilec->numresolutions; ++resno) {
 			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
 
-			for (bandno = 0; bandno < res->numbands; bandno++) {
+			for (bandno = 0; bandno < res->numbands; ++bandno) {
 				opj_tcd_band_t *band = &res->bands[bandno];
 
-				for (precno = 0; precno < res->pw * res->ph; precno++) {
+				for (precno = 0; precno < res->pw * res->ph; ++precno) {
 					opj_tcd_precinct_t *prc = &band->precincts[precno];
 
-					for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-						int x, y, w, i, j, orient;
+					for (cblkno = 0; cblkno < prc->cw * prc->ch; ++cblkno) {
+						int x, y, w, i, j, orient, cblk_w, cblk_h;
 						opj_tcd_cblk_t *cblk = &prc->cblks[cblkno];
 
-						orient = band->bandno;	/* FIXME */
-						if (orient == 2) {
-							orient = 1;
-						} else if (orient == 1) {
-							orient = 2;
-						}
-						
-						t1_decode_cblk(t1, cblk, orient, tcp->tccps[compno].roishift, tcp->tccps[compno].cblksty);
+						t1_decode_cblk(
+								t1,
+								cblk,
+								band->bandno,
+								tcp->tccps[compno].roishift,
+								tcp->tccps[compno].cblksty);
 
 						x = cblk->x0 - band->x0;
 						y = cblk->y0 - band->y0;
@@ -834,16 +1144,19 @@ void t1_decode_cblks(opj_t1_t *t1, opj_tcd_tile_t *tile, opj_tcp_t *tcp) {
 							opj_tcd_resolution_t *pres = &tilec->resolutions[resno - 1];
 							y += pres->y1 - pres->y0;
 						}
-						
+
+						cblk_w = cblk->x1 - cblk->x0;
+						cblk_h = cblk->y1 - cblk->y0;
+
 						if (tcp->tccps[compno].roishift) {
 							int thresh = 1 << tcp->tccps[compno].roishift;
-							for (j = 0; j < cblk->y1 - cblk->y0; j++) {
-								for (i = 0; i < cblk->x1 - cblk->x0; i++) {
-									int val = t1->data[j][i];
+							for (j = 0; j < cblk_h; ++j) {
+								for (i = 0; i < cblk_w; ++i) {
+									int val = t1->data[(j * t1->w) + i];
 									int mag = int_abs(val);
 									if (mag >= thresh) {
 										mag >>= tcp->tccps[compno].roishift;
-										t1->data[j][i] = val < 0 ? -mag : mag;
+										t1->data[(j * t1->w) + i] = val < 0 ? -mag : mag;
 									}
 								}
 							}
@@ -851,19 +1164,19 @@ void t1_decode_cblks(opj_t1_t *t1, opj_tcd_tile_t *tile, opj_tcp_t *tcp) {
 						
 						w = tilec->x1 - tilec->x0;
 						if (tcp->tccps[compno].qmfbid == 1) {
-							for (j = 0; j < cblk->y1 - cblk->y0; j++) {
-								for (i = 0; i < cblk->x1 - cblk->x0; i++) {
-									tilec->data[x + i + (y + j) * w] = t1->data[j][i]/2;
+							for (j = 0; j < cblk_h; ++j) {
+								for (i = 0; i < cblk_w; ++i) {
+									tilec->data[x + i + (y + j) * w] = t1->data[(j * t1->w) + i]/2;
 								}
 							}
 						} else {		/* if (tcp->tccps[compno].qmfbid == 0) */
-							for (j = 0; j < cblk->y1 - cblk->y0; j++) {
-								for (i = 0; i < cblk->x1 - cblk->x0; i++) {
-									if (t1->data[j][i] >> 1 == 0) {
+							for (j = 0; j < cblk_h; ++j) {
+								for (i = 0; i < cblk_w; ++i) {
+									if (t1->data[(j * t1->w) + i] >> 1 == 0) {
 										tilec->data[x + i + (y + j) * w] = 0;
 									} else {
-										double tmp = (double)(t1->data[j][i] * band->stepsize * 4096.0);
-										int tmp2 = ((int) (floor(fabs(tmp)))) + ((int) floor(fabs(tmp*2))%2);
+										double tmp = (double)(t1->data[(j * t1->w) + 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);
 									}
 								}
@@ -876,4 +1189,3 @@ void t1_decode_cblks(opj_t1_t *t1, opj_tcd_tile_t *tile, opj_tcp_t *tcp) {
 	} /* compno */
 }
 
-