Patch suggested by Callum Lerwick <seg@haxxed.com>: "This makes the t1 data arrays...

[openjpeg.git] / libopenjpeg / t1.h

diff --git a/libopenjpeg/t1.h b/libopenjpeg/t1.h
index a08d2e2dde6266ebc24087c94627cc3eed8cc5f3..1b6cdb7cf533f0e7266e872700f49f2414ab5cf2 100644 (file)
--- a/libopenjpeg/t1.h
+++ b/libopenjpeg/t1.h
@@ -1,9 +1,10 @@
 /*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Herv� Drolon, FreeImage Team
- * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,9 +44,6 @@ in T1.C are used by some function in TCD.C.
 /* ----------------------------------------------------------------------- */
 #define T1_NMSEDEC_BITS 7
 
-#define T1_MAXCBLKW 1024       /**< Maximum size of code-block (width) */
-#define T1_MAXCBLKH 1024       /**< Maximum size of code-block (heigth) */
-
 #define T1_SIG_NE 0x0001       /**< Context orientation : North-East direction */
 #define T1_SIG_SE 0x0002       /**< Context orientation : South-East direction */
 #define T1_SIG_SW 0x0004       /**< Context orientation : South-West direction */
@@ -67,17 +65,17 @@ in T1.C are used by some function in TCD.C.
 #define T1_REFINE 0x2000
 #define T1_VISIT 0x4000
 
-#define T1_NUMCTXS_AGG 1
 #define T1_NUMCTXS_ZC 9
-#define T1_NUMCTXS_MAG 3
 #define T1_NUMCTXS_SC 5
+#define T1_NUMCTXS_MAG 3
+#define T1_NUMCTXS_AGG 1
 #define T1_NUMCTXS_UNI 1
 
-#define T1_CTXNO_AGG 0
-#define T1_CTXNO_ZC (T1_CTXNO_AGG+T1_NUMCTXS_AGG)
-#define T1_CTXNO_MAG (T1_CTXNO_ZC+T1_NUMCTXS_ZC)
-#define T1_CTXNO_SC (T1_CTXNO_MAG+T1_NUMCTXS_MAG)
-#define T1_CTXNO_UNI (T1_CTXNO_SC+T1_NUMCTXS_SC)
+#define T1_CTXNO_ZC 0
+#define T1_CTXNO_SC (T1_CTXNO_ZC+T1_NUMCTXS_ZC)
+#define T1_CTXNO_MAG (T1_CTXNO_SC+T1_NUMCTXS_SC)
+#define T1_CTXNO_AGG (T1_CTXNO_MAG+T1_NUMCTXS_MAG)
+#define T1_CTXNO_UNI (T1_CTXNO_AGG+T1_NUMCTXS_AGG)
 #define T1_NUMCTXS (T1_CTXNO_UNI+T1_NUMCTXS_UNI)
 
 #define T1_NMSEDEC_FRACBITS (T1_NMSEDEC_BITS-1)
@@ -87,6 +85,8 @@ in T1.C are used by some function in TCD.C.
 
 /* ----------------------------------------------------------------------- */
 
+typedef short flag_t;
+
 /**
 Tier-1 coding (coding of code-block coefficients)
 */
@@ -99,20 +99,17 @@ typedef struct opj_t1 {
        /** RAW component */
        opj_raw_t *raw;
 
-       int lut_ctxno_zc[1024];
-       int lut_ctxno_sc[256];
-       int lut_ctxno_mag[4096];
-       int lut_spb[256];
-       int lut_nmsedec_sig[1 << T1_NMSEDEC_BITS];
-       int lut_nmsedec_sig0[1 << T1_NMSEDEC_BITS];
-       int lut_nmsedec_ref[1 << T1_NMSEDEC_BITS];
-       int lut_nmsedec_ref0[1 << T1_NMSEDEC_BITS];
-
-       int data[T1_MAXCBLKH][T1_MAXCBLKW];
-       int flags[T1_MAXCBLKH + 2][T1_MAXCBLKH + 2];
-
+       int *data;
+       flag_t *flags;
+       int w;
+       int h;
+       int datasize;
+       int flagssize;
+       int flags_stride;
 } opj_t1_t;
 
+#define MACRO_t1_flags(x,y) t1->flags[((x)*(t1->flags_stride))+(y)]
+
 /** @name Exported functions */
 /*@{*/
 /* ----------------------------------------------------------------------- */