FX_BOOL considered harmful, part 2.

core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h

Index: core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h
diff --git a/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h b/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h
index 2bd2ceac95e63896a273c4ee5bf81a40c0b037d9..f348e9654655a5db593521f964338511d00e9f7f 100644
--- a/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h
+++ b/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h
@@ -76,7 +76,7 @@ private:
     CJBig2_ArithDecoder *m_pArithDecoder;
     JBig2ArithCtx *m_gbContext;
     FX_WORD		m_DecodeType;
-    FX_BOOL LTP;
+    bool LTP;
     FX_RECT m_ReplaceRect;
 private:
 
@@ -112,12 +112,12 @@ private:
 
     CJBig2_Image *decode_Arith_Template3_unopt(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext);
 public:
-    FX_BOOL MMR;
+    bool MMR;
     FX_DWORD GBW;
     FX_DWORD GBH;
     uint8_t GBTEMPLATE;
-    FX_BOOL TPGDON;
-    FX_BOOL USESKIP;
+    bool TPGDON;
+    bool USESKIP;
     CJBig2_Image * SKIP;
     signed char GBAT[8];
 };
@@ -139,11 +139,11 @@ public:
 public:
     FX_DWORD GRW;
     FX_DWORD GRH;
-    FX_BOOL GRTEMPLATE;
+    bool GRTEMPLATE;
     CJBig2_Image *GRREFERENCE;
     int32_t GRREFERENCEDX;
     int32_t GRREFERENCEDY;
-    FX_BOOL TPGRON;
+    bool TPGRON;
     signed char	GRAT[4];
 };
 typedef struct {
@@ -167,8 +167,8 @@ public:
     CJBig2_Image *decode_Arith(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *grContext,
                                JBig2IntDecoderState *pIDS = NULL);
 public:
-    FX_BOOL SBHUFF;
-    FX_BOOL SBREFINE;
+    bool SBHUFF;
+    bool SBREFINE;
     FX_DWORD SBW;
     FX_DWORD SBH;
     FX_DWORD SBNUMINSTANCES;
@@ -179,10 +179,10 @@ public:
     uint8_t SBSYMCODELEN;
 
     CJBig2_Image **SBSYMS;
-    FX_BOOL SBDEFPIXEL;
+    bool SBDEFPIXEL;
 
     JBig2ComposeOp SBCOMBOP;
-    FX_BOOL TRANSPOSED;
+    bool TRANSPOSED;
 
     JBig2Corner REFCORNER;
     signed char SBDSOFFSET;
@@ -194,7 +194,7 @@ public:
                         *SBHUFFRDX,
                         *SBHUFFRDY,
                         *SBHUFFRSIZE;
-    FX_BOOL SBRTEMPLATE;
+    bool SBRTEMPLATE;
     signed char SBRAT[4];
 };
 class CJBig2_SDDProc : public CJBig2_Object
@@ -205,8 +205,8 @@ public:
 
     CJBig2_SymbolDict *decode_Huffman(CJBig2_BitStream *pStream, JBig2ArithCtx *gbContext, JBig2ArithCtx *grContext, IFX_Pause* pPause);
 public:
-    FX_BOOL SDHUFF;
-    FX_BOOL SDREFAGG;
+    bool SDHUFF;
+    bool SDREFAGG;
     FX_DWORD SDNUMINSYMS;
     CJBig2_Image ** SDINSYMS;
     FX_DWORD SDNUMNEWSYMS;
@@ -217,7 +217,7 @@ public:
                         *SDHUFFAGGINST;
     uint8_t SDTEMPLATE;
     signed char SDAT[8];
-    FX_BOOL SDRTEMPLATE;
+    bool SDRTEMPLATE;
     signed char SDRAT[4];
 };
 class CJBig2_HTRDProc : public CJBig2_Object
@@ -230,13 +230,13 @@ public:
 public:
     FX_DWORD HBW,
              HBH;
-    FX_BOOL HMMR;
+    bool HMMR;
     uint8_t HTEMPLATE;
     FX_DWORD HNUMPATS;
     CJBig2_Image **HPATS;
-    FX_BOOL HDEFPIXEL;
+    bool HDEFPIXEL;
     JBig2ComposeOp HCOMBOP;
-    FX_BOOL HENABLESKIP;
+    bool HENABLESKIP;
     FX_DWORD HGW,
              HGH;
     int32_t HGX,
@@ -254,7 +254,7 @@ public:
 
     CJBig2_PatternDict *decode_MMR(CJBig2_BitStream *pStream, IFX_Pause* pPause);
 public:
-    FX_BOOL HDMMR;
+    bool HDMMR;
     uint8_t HDPW,
             HDPH;
     FX_DWORD GRAYMAX;
@@ -268,8 +268,8 @@ public:
 
     FX_DWORD *decode_MMR(CJBig2_BitStream *pStream, IFX_Pause* pPause);
 public:
-    FX_BOOL GSMMR;
-    FX_BOOL GSUSESKIP;
+    bool GSMMR;
+    bool GSUSESKIP;
     uint8_t GSBPP;
     FX_DWORD GSW,
              GSH;