From f1e7c461dfabbff6b65a072f24f6711b34159361 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 23 Jul 2015 13:36:00 -0700 Subject: Revert "FX_BOOL considered harmful, part 2." This reverts commit 320b2313d19869333ed453af546e61a9fc2b81c9. Reason for revert: build failure. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1255693002 . --- core/src/fpdfapi/fpdf_font/font_int.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'core/src/fpdfapi/fpdf_font/font_int.h') diff --git a/core/src/fpdfapi/fpdf_font/font_int.h b/core/src/fpdfapi/fpdf_font/font_int.h index e52540853d..f57e52758a 100644 --- a/core/src/fpdfapi/fpdf_font/font_int.h +++ b/core/src/fpdfapi/fpdf_font/font_int.h @@ -12,15 +12,15 @@ class CPDF_CMapManager public: CPDF_CMapManager(); ~CPDF_CMapManager(); - void* GetPackage(bool bPrompt); - CPDF_CMap* GetPredefinedCMap(const CFX_ByteString& name, bool bPrompt); - CPDF_CID2UnicodeMap* GetCID2UnicodeMap(int charset, bool bPrompt); + void* GetPackage(FX_BOOL bPrompt); + CPDF_CMap* GetPredefinedCMap(const CFX_ByteString& name, FX_BOOL bPrompt); + CPDF_CID2UnicodeMap* GetCID2UnicodeMap(int charset, FX_BOOL bPrompt); void ReloadAll(); private: - CPDF_CMap* LoadPredefinedCMap(const CFX_ByteString& name, bool bPrompt); - CPDF_CID2UnicodeMap* LoadCID2UnicodeMap(int charset, bool bPrompt); - void DropAll(bool bReload); - bool m_bPrompted; + CPDF_CMap* LoadPredefinedCMap(const CFX_ByteString& name, FX_BOOL bPrompt); + CPDF_CID2UnicodeMap* LoadCID2UnicodeMap(int charset, FX_BOOL bPrompt); + void DropAll(FX_BOOL bReload); + FX_BOOL m_bPrompted; CFX_MapByteStringToPtr m_CMaps; CPDF_CID2UnicodeMap* m_CID2UnicodeMaps[6]; }; @@ -56,7 +56,7 @@ class CPDF_CMapParser public: CPDF_CMapParser(); ~CPDF_CMapParser() {} - bool Initialize(CPDF_CMap*); + FX_BOOL Initialize(CPDF_CMap*); void ParseWord(const CFX_ByteStringC& str); CFX_BinaryBuf m_AddMaps; private: @@ -80,10 +80,10 @@ class CPDF_CMap { public: CPDF_CMap(); - bool LoadPredefined(CPDF_CMapManager* pMgr, const FX_CHAR* name, bool bPromptCJK); - bool LoadEmbedded(const uint8_t* pData, FX_DWORD dwSize); + FX_BOOL LoadPredefined(CPDF_CMapManager* pMgr, const FX_CHAR* name, FX_BOOL bPromptCJK); + FX_BOOL LoadEmbedded(const uint8_t* pData, FX_DWORD dwSize); void Release(); - bool IsLoaded() const + FX_BOOL IsLoaded() const { return m_bLoaded; } @@ -91,7 +91,7 @@ public: { return m_Charset; } - bool IsVertWriting() const + FX_BOOL IsVertWriting() const { return m_bVertical; } @@ -109,14 +109,14 @@ protected: friend class CPDF_CIDFont; protected: CFX_ByteString m_PredefinedCMap; - bool m_bVertical; + FX_BOOL m_bVertical; int m_Charset, m_Coding; CodingScheme m_CodingScheme; int m_nCodeRanges; uint8_t* m_pLeadingBytes; FX_WORD* m_pMapping; uint8_t* m_pAddMapping; - bool m_bLoaded; + FX_BOOL m_bLoaded; const FXCMAP_CMap* m_pEmbedMap; CPDF_CMap* m_pUseMap; }; @@ -146,9 +146,9 @@ class CPDF_CID2UnicodeMap public: CPDF_CID2UnicodeMap(); ~CPDF_CID2UnicodeMap(); - bool Initialize(); - bool IsLoaded(); - void Load(CPDF_CMapManager* pMgr, int charset, bool bPromptCJK); + FX_BOOL Initialize(); + FX_BOOL IsLoaded(); + void Load(CPDF_CMapManager* pMgr, int charset, FX_BOOL bPromptCJK); FX_WCHAR UnicodeFromCID(FX_WORD CID); protected: int m_Charset; -- cgit v1.2.3