[trunk] Import patch from sumatrapdf team. This handle some testcase with no input...

[openjpeg.git] / src / lib / openjp2 / t1.h

diff --git a/src/lib/openjp2/t1.h b/src/lib/openjp2/t1.h
index 09fbe0f6c7efa991c3a00f2937648c5458679158..0de117af4baba47a670243cbab5714be7dac24f1 100644 (file)
--- a/src/lib/openjp2/t1.h
+++ b/src/lib/openjp2/t1.h
@@ -85,14 +85,12 @@ in T1.C are used by some function in TCD.C.
 
 /* ----------------------------------------------------------------------- */
 
-typedef OPJ_INT16 flag_t;
+typedef OPJ_INT16 opj_flag_t;
 
 /**
 Tier-1 coding (coding of code-block coefficients)
 */
 typedef struct opj_t1 {
-       /** codec context */
-       opj_common_ptr cinfo; /* TODO MSD : TO BE REMOVED */
 
        /** MQC component */
        opj_mqc_t *mqc;
@@ -100,7 +98,7 @@ typedef struct opj_t1 {
        opj_raw_t *raw;
 
     OPJ_INT32 *data;
-       flag_t *flags;
+       opj_flag_t *flags;
        OPJ_UINT32 w;
        OPJ_UINT32 h;
        OPJ_UINT32 datasize;
@@ -121,9 +119,9 @@ Encode the code-blocks of a tile
 @param tcp Tile coding parameters
 @param mct_norms  FIXME DOC
 */
-opj_bool opj_t1_encode_cblks(   opj_t1_t *t1,
-                                opj_tcd_tile_v2_t *tile,
-                                opj_tcp_v2_t *tcp,
+OPJ_BOOL opj_t1_encode_cblks(   opj_t1_t *t1,
+                                opj_tcd_tile_t *tile,
+                                opj_tcp_t *tcp,
                                 const OPJ_FLOAT64 * mct_norms);
 
 /**
@@ -132,8 +130,8 @@ Decode the code-blocks of a tile
 @param tilec The tile to decode
 @param tccp Tile coding parameters
 */
-opj_bool opj_t1_decode_cblks(   opj_t1_t* t1,
-                                opj_tcd_tilecomp_v2_t* tilec,
+OPJ_BOOL opj_t1_decode_cblks(   opj_t1_t* t1,
+                                opj_tcd_tilecomp_t* tilec,
                                 opj_tccp_t* tccp);