[trunk] Move INLINE definition within openjpeg.h header since application may use it

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

diff --git a/src/lib/openjp2/t1.h b/src/lib/openjp2/t1.h
index ccc6325fdd190fa24ba8a00930c8776d44289157..0de117af4baba47a670243cbab5714be7dac24f1 100644 (file)
--- a/src/lib/openjp2/t1.h
+++ b/src/lib/openjp2/t1.h
@@ -91,8 +91,6 @@ 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;
@@ -121,7 +119,7 @@ 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_BOOL opj_t1_encode_cblks(   opj_t1_t *t1,
                                 opj_tcd_tile_t *tile,
                                 opj_tcp_t *tcp,
                                 const OPJ_FLOAT64 * mct_norms);
@@ -132,7 +130,7 @@ 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_BOOL opj_t1_decode_cblks(   opj_t1_t* t1,
                                 opj_tcd_tilecomp_t* tilec,
                                 opj_tccp_t* tccp);