X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fopenjp2%2Ft1.h;h=c3fb7bed08181ceadb35b461faabe90148ed2d4b;hb=f88c9974e27161427c003dda5d89f61a5a3995e9;hp=5afc64900c756d9c77d72047dd59d387db6e6e58;hpb=0954bc11e3ab6a39d86e5ed51286da4b8989743d;p=openjpeg.git

diff --git a/src/lib/openjp2/t1.h b/src/lib/openjp2/t1.h
index 5afc6490..c3fb7bed 100644
--- a/src/lib/openjp2/t1.h
+++ b/src/lib/openjp2/t1.h
@@ -53,40 +53,40 @@ in T1.C are used by some function in TCD.C.
 /* CAUTION: the value of those constants must not be changed, otherwise the */
 /* optimization of opj_t1_updateflags() will break! */
 /* BEGINNING of flags that apply to opj_flag_t */
-#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 */
-#define T1_SIG_NW 0x0008	/**< Context orientation : North-West direction */
-#define T1_SIG_N 0x0010		/**< Context orientation : North direction */
-#define T1_SIG_E 0x0020		/**< Context orientation : East direction */
-#define T1_SIG_S 0x0040		/**< Context orientation : South direction */
-#define T1_SIG_W 0x0080		/**< Context orientation : West direction */
+#define T1_SIG_NE 0x0001U /**< Context orientation : North-East direction */
+#define T1_SIG_SE 0x0002U /**< Context orientation : South-East direction */
+#define T1_SIG_SW 0x0004U /**< Context orientation : South-West direction */
+#define T1_SIG_NW 0x0008U /**< Context orientation : North-West direction */
+#define T1_SIG_N 0x0010U  /**< Context orientation : North direction */
+#define T1_SIG_E 0x0020U  /**< Context orientation : East direction */
+#define T1_SIG_S 0x0040U  /**< Context orientation : South direction */
+#define T1_SIG_W 0x0080U  /**< Context orientation : West direction */
 #define T1_SIG_OTH (T1_SIG_N|T1_SIG_NE|T1_SIG_E|T1_SIG_SE|T1_SIG_S|T1_SIG_SW|T1_SIG_W|T1_SIG_NW)
 #define T1_SIG_PRIM (T1_SIG_N|T1_SIG_E|T1_SIG_S|T1_SIG_W)
 
-#define T1_SGN_N 0x0100
-#define T1_SGN_E 0x0200
-#define T1_SGN_S 0x0400
-#define T1_SGN_W 0x0800
+#define T1_SGN_N 0x0100U
+#define T1_SGN_E 0x0200U
+#define T1_SGN_S 0x0400U
+#define T1_SGN_W 0x0800U
 #define T1_SGN (T1_SGN_N|T1_SGN_E|T1_SGN_S|T1_SGN_W)
 
-#define T1_SIG 0x1000		/**< No longer used by decoder */
-#define T1_REFINE 0x2000	/**< No longer used by decoder */
-#define T1_VISIT 0x4000		/**< No longer used by decoder */
+#define T1_SIG    0x1000U /**< No longer used by decoder */
+#define T1_REFINE 0x2000U /**< No longer used by decoder */
+#define T1_VISIT  0x4000U /**< No longer used by decoder */
 /* END of flags that apply to opj_flag_t */
 
-#define T1_NUMCTXS_ZC 9
-#define T1_NUMCTXS_SC 5
+#define T1_NUMCTXS_ZC  9
+#define T1_NUMCTXS_SC  5
 #define T1_NUMCTXS_MAG 3
 #define T1_NUMCTXS_AGG 1
 #define T1_NUMCTXS_UNI 1
 
-#define T1_CTXNO_ZC 0
-#define T1_CTXNO_SC (T1_CTXNO_ZC+T1_NUMCTXS_ZC)
+#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_NUMCTXS   (T1_CTXNO_UNI+T1_NUMCTXS_UNI)
 
 #define T1_NMSEDEC_FRACBITS (T1_NMSEDEC_BITS-1)
 
@@ -94,27 +94,27 @@ in T1.C are used by some function in TCD.C.
 #define T1_TYPE_RAW 1	/**< No encoding the information is store under raw format in codestream (mode switch RAW)*/
 
 /* Those flags are used by opj_colflag_t */
-#define T1_COLFLAG_RBS				4 /* RBS = Row Bit Shift */
-#define T1_COLFLAG_SIG_OTHER_ROW_0	(1 << 0)  /**< This sample has at least one significant neighbour */
-#define T1_COLFLAG_SIG_ROW_0		(1 << 1)  /**< This sample is significant */
-#define T1_COLFLAG_VISIT_ROW_0		(1 << 2)  /**< This sample has been visited */
-#define T1_COLFLAG_REFINE_ROW_0		(1 << 3)  /**< This sample has been refined */
-#define T1_COLFLAG_SIG_OTHER_ROW_1	(T1_COLFLAG_SIG_OTHER_ROW_0 << T1_COLFLAG_RBS)
-#define T1_COLFLAG_SIG_ROW_1		(T1_COLFLAG_SIG_ROW_0 << T1_COLFLAG_RBS)
-#define T1_COLFLAG_VISIT_ROW_1		(T1_COLFLAG_VISIT_ROW_0 << T1_COLFLAG_RBS)
-#define T1_COLFLAG_REFINE_ROW_1		(T1_COLFLAG_REFINE_ROW_0 << T1_COLFLAG_RBS)
-#define T1_COLFLAG_SIG_OTHER_ROW_2	(T1_COLFLAG_SIG_OTHER_ROW_0 << (2*T1_COLFLAG_RBS))
-#define T1_COLFLAG_SIG_ROW_2		(T1_COLFLAG_SIG_ROW_0 << (2*T1_COLFLAG_RBS))
-#define T1_COLFLAG_VISIT_ROW_2		(T1_COLFLAG_VISIT_ROW_0 << (2*T1_COLFLAG_RBS))
-#define T1_COLFLAG_REFINE_ROW_2		(T1_COLFLAG_REFINE_ROW_0 << (2*T1_COLFLAG_RBS))
-#define T1_COLFLAG_SIG_OTHER_ROW_3	(T1_COLFLAG_SIG_OTHER_ROW_0 << (3*T1_COLFLAG_RBS))
-#define T1_COLFLAG_SIG_ROW_3		(T1_COLFLAG_SIG_ROW_0 << (3*T1_COLFLAG_RBS))
-#define T1_COLFLAG_VISIT_ROW_3		(T1_COLFLAG_VISIT_ROW_0 << (3*T1_COLFLAG_RBS))
-#define T1_COLFLAG_REFINE_ROW_3		(T1_COLFLAG_REFINE_ROW_0 << (3*T1_COLFLAG_RBS))
+#define T1_COLFLAG_RBS              4U /* RBS = Row Bit Shift */
+#define T1_COLFLAG_SIG_OTHER_ROW_0 (1U << 0U)  /**< This sample has at least one significant neighbour */
+#define T1_COLFLAG_SIG_ROW_0       (1U << 1U)  /**< This sample is significant */
+#define T1_COLFLAG_VISIT_ROW_0     (1U << 2U)  /**< This sample has been visited */
+#define T1_COLFLAG_REFINE_ROW_0    (1U << 3U)  /**< This sample has been refined */
+#define T1_COLFLAG_SIG_OTHER_ROW_1 (T1_COLFLAG_SIG_OTHER_ROW_0 << (1U * T1_COLFLAG_RBS))
+#define T1_COLFLAG_SIG_ROW_1       (T1_COLFLAG_SIG_ROW_0       << (1U * T1_COLFLAG_RBS))
+#define T1_COLFLAG_VISIT_ROW_1     (T1_COLFLAG_VISIT_ROW_0     << (1U * T1_COLFLAG_RBS))
+#define T1_COLFLAG_REFINE_ROW_1    (T1_COLFLAG_REFINE_ROW_0    << (1U * T1_COLFLAG_RBS))
+#define T1_COLFLAG_SIG_OTHER_ROW_2 (T1_COLFLAG_SIG_OTHER_ROW_0 << (2U * T1_COLFLAG_RBS))
+#define T1_COLFLAG_SIG_ROW_2       (T1_COLFLAG_SIG_ROW_0       << (2U * T1_COLFLAG_RBS))
+#define T1_COLFLAG_VISIT_ROW_2     (T1_COLFLAG_VISIT_ROW_0     << (2U * T1_COLFLAG_RBS))
+#define T1_COLFLAG_REFINE_ROW_2    (T1_COLFLAG_REFINE_ROW_0    << (2U * T1_COLFLAG_RBS))
+#define T1_COLFLAG_SIG_OTHER_ROW_3 (T1_COLFLAG_SIG_OTHER_ROW_0 << (3U * T1_COLFLAG_RBS))
+#define T1_COLFLAG_SIG_ROW_3       (T1_COLFLAG_SIG_ROW_0       << (3U * T1_COLFLAG_RBS))
+#define T1_COLFLAG_VISIT_ROW_3     (T1_COLFLAG_VISIT_ROW_0     << (3U * T1_COLFLAG_RBS))
+#define T1_COLFLAG_REFINE_ROW_3    (T1_COLFLAG_REFINE_ROW_0    << (3U * T1_COLFLAG_RBS))
 
 /* ----------------------------------------------------------------------- */
 
-typedef OPJ_INT16 opj_flag_t;
+typedef OPJ_UINT16 opj_flag_t;
 
 /** Flags for 4 consecutive rows of a column */
 typedef OPJ_UINT16 opj_colflag_t;