minor changes in cmake flags

[openjpeg.git] / libopenjpeg / t1.h

diff --git a/libopenjpeg/t1.h b/libopenjpeg/t1.h
index 9d51d53ebc268f844432b0a244319a252295db7f..572ec88d2f62d5378ddf7db3d437868c7c556411 100644 (file)
--- a/libopenjpeg/t1.h
+++ b/libopenjpeg/t1.h
@@ -44,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 */
@@ -102,11 +99,17 @@ typedef struct opj_t1 {
        /** RAW component */
        opj_raw_t *raw;
 
-       int data[T1_MAXCBLKH][T1_MAXCBLKW];
-       flag_t flags[T1_MAXCBLKH + 2][T1_MAXCBLKW + 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 */
 /*@{*/
 /* ----------------------------------------------------------------------- */
@@ -132,10 +135,10 @@ void t1_encode_cblks(opj_t1_t *t1, opj_tcd_tile_t *tile, opj_tcp_t *tcp);
 /**
 Decode the code-blocks of a tile
 @param t1 T1 handle
-@param tile The tile to decode
-@param tcp Tile coding parameters
+@param tilec The tile to decode
+@param tccp Tile coding parameters
 */
-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_tilecomp_t* tilec, opj_tccp_t* tccp);
 /* ----------------------------------------------------------------------- */
 /*@}*/