FX Bool considered harmful, part 3

core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef _JBIG2_GENERAL_DECODER_H_
 #define _JBIG2_GENERAL_DECODER_H_
 
 #include "../../../include/fxcodec/fx_codec_def.h"
@@ skipping 58 matching lines @@
     FXCODEC_STATUS decode_Arith_Template3_opt3(CJBig2_Image *pImage, CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext, IFX_Pause* pPause);
     FXCODEC_STATUS decode_Arith_Template3_unopt(CJBig2_Image * pImage, CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext, IFX_Pause* pPause);
     FX_DWORD    m_loopIndex;
     uint8_t *   m_pLine;
     IFX_Pause*  m_pPause;
     FXCODEC_STATUS      m_ProssiveStatus;
     CJBig2_Image** m_pImage;
     CJBig2_ArithDecoder *m_pArithDecoder;
     JBig2ArithCtx *m_gbContext;
     FX_WORD             m_DecodeType;
-    FX_BOOL LTP;
+    bool LTP;
     FX_RECT m_ReplaceRect;
 private:
 
     CJBig2_Image *decode_Arith_Template0_opt(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext);
 
     CJBig2_Image *decode_Arith_Template0_opt2(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext);
 
     CJBig2_Image *decode_Arith_Template0_opt3(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext);
 
     CJBig2_Image *decode_Arith_Template0_unopt(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext);
@@ skipping 15 matching lines @@
     CJBig2_Image *decode_Arith_Template2_unopt(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext);
 
     CJBig2_Image *decode_Arith_Template3_opt(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext);
 
     CJBig2_Image *decode_Arith_Template3_opt2(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext);
 
     CJBig2_Image *decode_Arith_Template3_opt3(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext);
 
     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];
 };
 class CJBig2_GRRDProc : public CJBig2_Object
 {
 public:
 
     CJBig2_Image *decode(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *grContext);
 
     CJBig2_Image *decode_Template0_unopt(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *grContext);
 
     CJBig2_Image *decode_Template0_opt(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *grContext);
 
     CJBig2_Image *decode_Template1_unopt(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *grContext);
 
     CJBig2_Image *decode_Template1_opt(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *grContext);
 
     CJBig2_Image *decode_V1(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *grContext);
 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 {
     CJBig2_ArithIntDecoder *IADT,
                            *IAFS,
                            *IADS,
                            *IAIT,
                            *IARI,
                            *IARDW,
                            *IARDH,
                            *IARDX,
                            *IARDY;
     CJBig2_ArithIaidDecoder *IAID;
 } JBig2IntDecoderState;
 class CJBig2_TRDProc : public CJBig2_Object
 {
 public:
 
     CJBig2_Image *decode_Huffman(CJBig2_BitStream *pStream, JBig2ArithCtx *grContext);
 
     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;
     FX_DWORD SBSTRIPS;
     FX_DWORD SBNUMSYMS;
 
     JBig2HuffmanCode *SBSYMCODES;
     uint8_t SBSYMCODELEN;
 
     CJBig2_Image **SBSYMS;
-    FX_BOOL SBDEFPIXEL;
+    bool SBDEFPIXEL;
 
     JBig2ComposeOp SBCOMBOP;
-    FX_BOOL TRANSPOSED;
+    bool TRANSPOSED;
 
     JBig2Corner REFCORNER;
     signed char SBDSOFFSET;
     CJBig2_HuffmanTable *SBHUFFFS,
                         *SBHUFFDS,
                         *SBHUFFDT,
                         *SBHUFFRDW,
                         *SBHUFFRDH,
                         *SBHUFFRDX,
                         *SBHUFFRDY,
                         *SBHUFFRSIZE;
-    FX_BOOL SBRTEMPLATE;
+    bool SBRTEMPLATE;
     signed char SBRAT[4];
 };
 class CJBig2_SDDProc : public CJBig2_Object
 {
 public:
 
     CJBig2_SymbolDict *decode_Arith(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext, JBig2ArithCtx *grContext);
 
     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;
     FX_DWORD SDNUMEXSYMS;
     CJBig2_HuffmanTable *SDHUFFDH,
                         *SDHUFFDW,
                         *SDHUFFBMSIZE,
                         *SDHUFFAGGINST;
     uint8_t SDTEMPLATE;
     signed char SDAT[8];
-    FX_BOOL SDRTEMPLATE;
+    bool SDRTEMPLATE;
     signed char SDRAT[4];
 };
 class CJBig2_HTRDProc : public CJBig2_Object
 {
 public:
 
     CJBig2_Image *decode_Arith(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext, IFX_Pause* pPause);
 
     CJBig2_Image *decode_MMR(CJBig2_BitStream *pStream, IFX_Pause* pPause);
 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,
              HGY;
     FX_WORD HRX,
             HRY;
     uint8_t HPW,
             HPH;
 };
 class CJBig2_PDDProc : public CJBig2_Object
 {
 public:
 
     CJBig2_PatternDict *decode_Arith(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext, IFX_Pause* pPause);
 
     CJBig2_PatternDict *decode_MMR(CJBig2_BitStream *pStream, IFX_Pause* pPause);
 public:
-    FX_BOOL HDMMR;
+    bool HDMMR;
     uint8_t HDPW,
             HDPH;
     FX_DWORD GRAYMAX;
     uint8_t HDTEMPLATE;
 };
 class CJBig2_GSIDProc : public CJBig2_Object
 {
 public:
 
     FX_DWORD *decode_Arith(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext, IFX_Pause* pPause);
 
     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;
     uint8_t GSTEMPLATE;
     CJBig2_Image *GSKIP;
 };
 #endif