Revert "FX_BOOL considered harmful, part 2."

core/src/fpdfapi/fpdf_page/pageint.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 CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 #define CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 
 #include <map>
 
 #include "../../../../third_party/base/nonstd_unique_ptr.h"
 #include "../../../include/fpdfapi/fpdf_pageobj.h"
 
 #define PARSE_STEP_LIMIT                100
 
 class CPDF_StreamParser
 {
 public:
 
     CPDF_StreamParser(const uint8_t* pData, FX_DWORD dwSize);
     ~CPDF_StreamParser();
 
-    CPDF_Stream*                ReadInlineStream(CPDF_Document* pDoc, CPDF_Dictionary* pDict, CPDF_Object* pCSObj, bool bDecode);
+    CPDF_Stream*                ReadInlineStream(CPDF_Document* pDoc, CPDF_Dictionary* pDict, CPDF_Object* pCSObj, FX_BOOL bDecode);
     typedef enum { EndOfData, Number, Keyword, Name, Others } SyntaxType;
 
     SyntaxType                  ParseNextElement();
     uint8_t*                    GetWordBuf()
     {
         return m_WordBuffer;
     }
     FX_DWORD                    GetWordSize()
     {
         return m_WordSize;
     }
     CPDF_Object*                GetObject()
     {
         CPDF_Object* pObj = m_pLastObj;
         m_pLastObj = NULL;
         return pObj;
     }
     FX_DWORD                    GetPos()
     {
         return m_Pos;
     }
     void                                SetPos(FX_DWORD pos)
     {
         m_Pos = pos;
     }
 
-    CPDF_Object*                ReadNextObject(bool bAllowNestedArray = false, bool bInArray = false);
+    CPDF_Object*                ReadNextObject(FX_BOOL bAllowNestedArray = FALSE, FX_BOOL bInArray = FALSE);
     void                                SkipPathObject();
 protected:
-    void                                GetNextWord(bool& bIsNumber);
+    void                                GetNextWord(FX_BOOL& bIsNumber);
     CFX_ByteString              ReadString();
     CFX_ByteString              ReadHexString();
     const uint8_t*              m_pBuf;
     FX_DWORD                    m_Size;
     FX_DWORD                    m_Pos;
     uint8_t                             m_WordBuffer[256];
     FX_DWORD                    m_WordSize;
     CPDF_Object*                m_pLastObj;
 };
 typedef enum {
@@ skipping 33 matching lines @@
     PDFOP_CurveTo_23, PDFOP_SetLineWidth,
     PDFOP_Clip, PDFOP_EOClip,
     PDFOP_CurveTo_13, PDFOP_NextLineShowText,
     PDFOP_NextLineShowText_Space, PDFOP_Invalid
 } PDFOP;
 #define PARAM_BUF_SIZE  16
 typedef struct {
     int                 m_Type;
     union {
         struct {
-            bool                m_bInteger;
+            FX_BOOL             m_bInteger;
             union {
                 int             m_Integer;
                 FX_FLOAT m_Float;
             };
         } m_Number;
         CPDF_Object*    m_pObject;
         struct {
             int                 m_Len;
             char                m_Buffer[32];
         } m_Name;
@@ skipping 11 matching lines @@
         CPDF_Dictionary* pParentResources,
         CFX_AffineMatrix* pmtContentToUser,
         CPDF_PageObjects* pObjList,
         CPDF_Dictionary* pResources,
         CFX_FloatRect* pBBox,
         CPDF_ParseOptions* pOptions,
         CPDF_AllStates* pAllStates,
         int level);
     ~CPDF_StreamContentParser();
 
-    bool ShouldAbort() const { return m_bAbort; }
+    FX_BOOL ShouldAbort() const { return m_bAbort; }
     CPDF_PageObjects* GetObjectList() const { return m_pObjectList; }
     CPDF_AllStates* GetCurStates() const { return m_pCurStates.get(); }
-    bool IsColored() const { return m_bColored; }
+    FX_BOOL IsColored() const { return m_bColored; }
     const FX_FLOAT* GetType3Data() const { return m_Type3Data; }
 
     void                                AddNumberParam(const FX_CHAR* str, int len);
     void                                AddObjectParam(CPDF_Object* pObj);
     void                                AddNameParam(const FX_CHAR* name, int size);
     int                                 GetNextParamPos();
     void                                ClearAllParams();
     CPDF_Object*                GetObject(FX_DWORD index);
     CFX_ByteString              GetString(FX_DWORD index);
     FX_FLOAT                    GetNumber(FX_DWORD index);
     FX_FLOAT            GetNumber16(FX_DWORD index);
     int                                 GetInteger(FX_DWORD index)
     {
         return (int32_t)(GetNumber(index));
     }
-    bool                                OnOperator(const FX_CHAR* op);
+    FX_BOOL                             OnOperator(const FX_CHAR* op);
     void                                BigCaseCaller(int index);
     FX_DWORD                    GetParsePos()
     {
         return m_pSyntax->GetPos();
     }
     void                                AddTextObject(CFX_ByteString* pText, FX_FLOAT fInitKerning, FX_FLOAT* pKerning, int count);
 
     void                                ConvertUserSpace(FX_FLOAT& x, FX_FLOAT& y);
     void                                ConvertTextSpace(FX_FLOAT& x, FX_FLOAT& y);
     void                                OnChangeTextMatrix();
     FX_DWORD                    Parse(const uint8_t* pData, FX_DWORD dwSize, FX_DWORD max_cost);
     void                                ParsePathObject();
     void                                AddPathPoint(FX_FLOAT x, FX_FLOAT y, int flag);
     void                                AddPathRect(FX_FLOAT x, FX_FLOAT y, FX_FLOAT w, FX_FLOAT h);
-    void                                AddPathObject(int FillType, bool bStroke);
-    CPDF_ImageObject*   AddImage(CPDF_Stream* pStream, CPDF_Image* pImage, bool bInline);
+    void                                AddPathObject(int FillType, FX_BOOL bStroke);
+    CPDF_ImageObject*   AddImage(CPDF_Stream* pStream, CPDF_Image* pImage, FX_BOOL bInline);
     void                                AddDuplicateImage();
     void                                AddForm(CPDF_Stream*);
-    void                                SetGraphicStates(CPDF_PageObject* pObj, bool bColor, bool bText, bool bGraph);
+    void                                SetGraphicStates(CPDF_PageObject* pObj, FX_BOOL bColor, FX_BOOL bText, FX_BOOL bGraph);
     void                                SaveStates(CPDF_AllStates*);
     void                                RestoreStates(CPDF_AllStates*);
     CPDF_Font*                  FindFont(const CFX_ByteString& name);
     CPDF_ColorSpace*    FindColorSpace(const CFX_ByteString& name);
-    CPDF_Pattern*               FindPattern(const CFX_ByteString& name, bool bShading);
+    CPDF_Pattern*               FindPattern(const CFX_ByteString& name, FX_BOOL bShading);
     CPDF_Object*                FindResourceObj(const CFX_ByteStringC& type, const CFX_ByteString& name);
 
 protected:
     struct OpCode {
         FX_DWORD m_OpId;
         void (CPDF_StreamContentParser::*m_OpHandler)();
     };
     static const OpCode g_OpCodes[];
 
     void Handle_CloseFillStrokePath();
@@ skipping 76 matching lines @@
     CPDF_Dictionary* m_pParentResources;
     CPDF_Dictionary* m_pResources;
     CPDF_PageObjects* m_pObjectList;
     int m_Level;
     CFX_AffineMatrix m_mtContentToUser;
     CFX_FloatRect m_BBox;
     CPDF_ParseOptions m_Options;
     _ContentParam m_ParamBuf1[PARAM_BUF_SIZE];
     FX_DWORD m_ParamStartPos;
     FX_DWORD m_ParamCount;
-    bool m_bAbort;
+    FX_BOOL m_bAbort;
     CPDF_StreamParser* m_pSyntax;
     nonstd::unique_ptr<CPDF_AllStates> m_pCurStates;
     CPDF_ContentMark m_CurContentMark;
     CFX_PtrArray m_ClipTextList;
     CPDF_TextObject* m_pLastTextObject;
     FX_FLOAT m_DefFontSize;
     int m_CompatCount;
     FX_PATHPOINT* m_pPathPoints;
     int m_PathPointCount;
     int m_PathAllocSize;
     FX_FLOAT m_PathStartX;
     FX_FLOAT m_PathStartY;
     FX_FLOAT m_PathCurrentX;
     FX_FLOAT m_PathCurrentY;
     int m_PathClipType;
     CFX_ByteString m_LastImageName;
     CPDF_Image* m_pLastImage;
     CFX_BinaryBuf m_LastImageDict;
     CFX_BinaryBuf m_LastImageData;
     CPDF_Dictionary* m_pLastImageDict;
     CPDF_Dictionary* m_pLastCloneImageDict;
-    bool m_bReleaseLastDict;
-    bool m_bSameLastDict;
-    bool m_bColored;
+    FX_BOOL m_bReleaseLastDict;
+    FX_BOOL m_bSameLastDict;
+    FX_BOOL m_bColored;
     FX_FLOAT m_Type3Data[6];
-    bool m_bResourceMissing;
+    FX_BOOL m_bResourceMissing;
     CFX_PtrArray m_StateStack;
 };
 class CPDF_ContentParser
 {
 public:
     CPDF_ContentParser();
     ~CPDF_ContentParser();
     typedef enum { Ready, ToBeContinued, Done } ParseStatus;
     ParseStatus                 GetStatus()
     {
         return m_Status;
     }
     void                                Start(CPDF_Page* pPage, CPDF_ParseOptions* pOptions);
     void                                Start(CPDF_Form* pForm, CPDF_AllStates* pGraphicStates, CFX_AffineMatrix* pParentMatrix,
                               CPDF_Type3Char* pType3Char, CPDF_ParseOptions* pOptions, int level);
     void                                Continue(IFX_Pause* pPause);
     int                                 EstimateProgress();
 protected:
     void                                Clear();
     ParseStatus                 m_Status;
     CPDF_PageObjects*   m_pObjects;
-    bool                                m_bForm;
+    FX_BOOL                             m_bForm;
     CPDF_ParseOptions   m_Options;
     CPDF_Type3Char*             m_pType3Char;
     int                                 m_InternalStage;
     CPDF_StreamAcc*             m_pSingleStream;
     CPDF_StreamAcc**    m_pStreamArray;
     FX_DWORD                    m_nStreams;
     uint8_t*                    m_pData;
     FX_DWORD                    m_Size;
     class CPDF_StreamContentParser*     m_pParser;
     FX_DWORD                    m_CurrentOffset;
@@ skipping 11 matching lines @@
     FX_FLOAT                            m_TextX, m_TextY, m_TextLineX, m_TextLineY;
     FX_FLOAT                            m_TextLeading, m_TextRise, m_TextHorzScale;
 };
 
 class CPDF_DocPageData
 {
   public:
     explicit CPDF_DocPageData(CPDF_Document *pPDFDoc);
     ~CPDF_DocPageData();
 
-    void                        Clear(bool bRelease = false);
-    CPDF_Font*                  GetFont(CPDF_Dictionary* pFontDict, bool findOnly);
+    void                        Clear(FX_BOOL bRelease = FALSE);
+    CPDF_Font*                  GetFont(CPDF_Dictionary* pFontDict, FX_BOOL findOnly);
     CPDF_Font*                  GetStandardFont(const CFX_ByteStringC& fontName, CPDF_FontEncoding* pEncoding);
     void                        ReleaseFont(CPDF_Dictionary* pFontDict);
     CPDF_ColorSpace*            GetColorSpace(CPDF_Object* pCSObj, CPDF_Dictionary* pResources);
     CPDF_ColorSpace*            GetCopiedColorSpace(CPDF_Object* pCSObj);
     void                        ReleaseColorSpace(CPDF_Object* pColorSpace);
-    CPDF_Pattern*               GetPattern(CPDF_Object* pPatternObj, bool bShading, const CFX_AffineMatrix* matrix);
+    CPDF_Pattern*               GetPattern(CPDF_Object* pPatternObj, FX_BOOL bShading, const CFX_AffineMatrix* matrix);
     void                        ReleasePattern(CPDF_Object* pPatternObj);
     CPDF_Image*                 GetImage(CPDF_Object* pImageStream);
     void                        ReleaseImage(CPDF_Object* pImageStream);
     CPDF_IccProfile*            GetIccProfile(CPDF_Stream* pIccProfileStream);
     void                        ReleaseIccProfile(CPDF_IccProfile* pIccProfile);
     CPDF_StreamAcc*             GetFontFileStreamAcc(CPDF_Stream* pFontStream);
-    void                        ReleaseFontFileStreamAcc(CPDF_Stream* pFontStream, bool bForce = false);
-    bool                     IsForceClear() const {return m_bForceClear;}
+    void                        ReleaseFontFileStreamAcc(CPDF_Stream* pFontStream, FX_BOOL bForce = FALSE);
+    FX_BOOL                     IsForceClear() const {return m_bForceClear;}
     CPDF_CountedColorSpace*     FindColorSpacePtr(CPDF_Object* pCSObj) const;
     CPDF_CountedPattern*        FindPatternPtr(CPDF_Object* pPatternObj) const;
 
   private:
     using CPDF_CountedFont = CPDF_CountedObject<CPDF_Font>;
     using CPDF_CountedIccProfile = CPDF_CountedObject<CPDF_IccProfile>;
     using CPDF_CountedImage = CPDF_CountedObject<CPDF_Image>;
     using CPDF_CountedStreamAcc = CPDF_CountedObject<CPDF_StreamAcc>;
 
     using CPDF_ColorSpaceMap = std::map<CPDF_Object*, CPDF_CountedColorSpace*>;
     using CPDF_FontFileMap = std::map<CPDF_Stream*, CPDF_CountedStreamAcc*>;
     using CPDF_FontMap = std::map<CPDF_Dictionary*, CPDF_CountedFont*>;
     using CPDF_IccProfileMap = std::map<CPDF_Stream*, CPDF_CountedIccProfile*>;
     using CPDF_ImageMap = std::map<FX_DWORD, CPDF_CountedImage*>;
     using CPDF_PatternMap = std::map<CPDF_Object*, CPDF_CountedPattern*>;
 
     CPDF_Document* const m_pPDFDoc;
     CFX_MapByteStringToPtr m_HashProfileMap;
-    bool m_bForceClear;
+    FX_BOOL m_bForceClear;
 
     CPDF_ColorSpaceMap m_ColorSpaceMap;
     CPDF_FontFileMap m_FontFileMap;
     CPDF_FontMap m_FontMap;
     CPDF_IccProfileMap m_IccProfileMap;
     CPDF_ImageMap m_ImageMap;
     CPDF_PatternMap m_PatternMap;
 };
 
 class CPDF_Function
 {
 public:
     static CPDF_Function*       Load(CPDF_Object* pFuncObj);
     virtual ~CPDF_Function();
-    bool                Call(FX_FLOAT* inputs, int ninputs, FX_FLOAT* results, int& nresults) const;
+    FX_BOOL             Call(FX_FLOAT* inputs, int ninputs, FX_FLOAT* results, int& nresults) const;
     int                 CountInputs()
     {
         return m_nInputs;
     }
     int                 CountOutputs()
     {
         return m_nOutputs;
     }
 protected:
     CPDF_Function();
     int                 m_nInputs, m_nOutputs;
     FX_FLOAT*   m_pDomains;
     FX_FLOAT*   m_pRanges;
-    bool                Init(CPDF_Object* pObj);
-    virtual bool        v_Init(CPDF_Object* pObj) = 0;
-    virtual bool        v_Call(FX_FLOAT* inputs, FX_FLOAT* results) const = 0;
+    FX_BOOL             Init(CPDF_Object* pObj);
+    virtual FX_BOOL     v_Init(CPDF_Object* pObj) = 0;
+    virtual FX_BOOL     v_Call(FX_FLOAT* inputs, FX_FLOAT* results) const = 0;
 };
 class CPDF_IccProfile
 {
 public:
     CPDF_IccProfile(const uint8_t* pData, FX_DWORD dwSize);
     ~CPDF_IccProfile();
     int32_t GetComponents() const { return m_nSrcComponents; }
-    bool                                        m_bsRGB;
+    FX_BOOL                                     m_bsRGB;
     void*                               m_pTransform;
 private:
     int32_t                m_nSrcComponents;
 };
 
 class CPDF_DeviceCS : public CPDF_ColorSpace
 {
 public:
     CPDF_DeviceCS(CPDF_Document* pDoc, int family);
 
-    bool GetRGB(FX_FLOAT* pBuf,
+    FX_BOOL GetRGB(FX_FLOAT* pBuf,
                    FX_FLOAT& R,
                    FX_FLOAT& G,
                    FX_FLOAT& B) const override;
-    bool SetRGB(FX_FLOAT* pBuf,
+    FX_BOOL SetRGB(FX_FLOAT* pBuf,
                    FX_FLOAT R,
                    FX_FLOAT G,
                    FX_FLOAT B) const override;
-    bool v_GetCMYK(FX_FLOAT* pBuf,
+    FX_BOOL v_GetCMYK(FX_FLOAT* pBuf,
                       FX_FLOAT& c,
                       FX_FLOAT& m,
                       FX_FLOAT& y,
                       FX_FLOAT& k) const override;
-    bool v_SetCMYK(FX_FLOAT* pBuf,
+    FX_BOOL v_SetCMYK(FX_FLOAT* pBuf,
                       FX_FLOAT c,
                       FX_FLOAT m,
                       FX_FLOAT y,
                       FX_FLOAT k) const override;
     void TranslateImageLine(uint8_t* pDestBuf,
                             const uint8_t* pSrcBuf,
                             int pixels,
                             int image_width,
                             int image_height,
-                            bool bTransMask = false) const override;
+                            FX_BOOL bTransMask = FALSE) const override;
 };
 
 class CPDF_PatternCS : public CPDF_ColorSpace
 {
 public:
     explicit CPDF_PatternCS(CPDF_Document* pDoc)
         : CPDF_ColorSpace(pDoc, PDFCS_PATTERN, 1),
           m_pBaseCS(nullptr),
           m_pCountedBaseCS(nullptr) {
     }
     ~CPDF_PatternCS() override;
-    bool v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) override;
-    bool GetRGB(FX_FLOAT* pBuf,
+    FX_BOOL v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) override;
+    FX_BOOL GetRGB(FX_FLOAT* pBuf,
                    FX_FLOAT& R,
                    FX_FLOAT& G,
                    FX_FLOAT& B) const override;
     CPDF_ColorSpace* GetBaseCS() const override;
 
 private:
     CPDF_ColorSpace* m_pBaseCS;
     CPDF_CountedColorSpace* m_pCountedBaseCS;
 };
 
 #endif  // CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_