From 7c1b07fde27dfbbf1d979d9dfd616b1a42591e5f Mon Sep 17 00:00:00 2001 From: npm Date: Wed, 5 Oct 2016 08:07:30 -0700 Subject: Remove FX_BOOL from core/fpdfapi/font FX_BOOL can be replaced by bool. Also replaced in a couple other places so that Winbots pass. Review-Url: https://codereview.chromium.org/2395803002 --- core/fpdfapi/page/fpdf_page_parser.cpp | 6 +++--- core/fpdfapi/page/pageint.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'core/fpdfapi/page') diff --git a/core/fpdfapi/page/fpdf_page_parser.cpp b/core/fpdfapi/page/fpdf_page_parser.cpp index 48a24da5c5..23d087304f 100644 --- a/core/fpdfapi/page/fpdf_page_parser.cpp +++ b/core/fpdfapi/page/fpdf_page_parser.cpp @@ -223,7 +223,7 @@ CPDF_StreamContentParser::CPDF_StreamContentParser( m_pLastImageDict(nullptr), m_pLastCloneImageDict(nullptr), m_bReleaseLastDict(TRUE), - m_bColored(FALSE), + m_bColored(false), m_bResourceMissing(FALSE) { if (pmtContentToUser) m_mtContentToUser = *pmtContentToUser; @@ -714,14 +714,14 @@ void CPDF_StreamContentParser::Handle_SetDash() { void CPDF_StreamContentParser::Handle_SetCharWidth() { m_Type3Data[0] = GetNumber(1); m_Type3Data[1] = GetNumber(0); - m_bColored = TRUE; + m_bColored = true; } void CPDF_StreamContentParser::Handle_SetCachedDevice() { for (int i = 0; i < 6; i++) { m_Type3Data[i] = GetNumber(5 - i); } - m_bColored = FALSE; + m_bColored = false; } void CPDF_StreamContentParser::Handle_ExecuteXObject() { diff --git a/core/fpdfapi/page/pageint.h b/core/fpdfapi/page/pageint.h index 2d3927d13d..8bbadf0cf0 100644 --- a/core/fpdfapi/page/pageint.h +++ b/core/fpdfapi/page/pageint.h @@ -120,7 +120,7 @@ class CPDF_StreamContentParser { CPDF_PageObjectHolder* GetPageObjectHolder() const { return m_pObjectHolder; } CPDF_AllStates* GetCurStates() const { return m_pCurStates.get(); } - FX_BOOL IsColored() const { return m_bColored; } + bool IsColored() const { return m_bColored; } const FX_FLOAT* GetType3Data() const { return m_Type3Data; } void AddNumberParam(const FX_CHAR* str, int len); @@ -276,7 +276,7 @@ class CPDF_StreamContentParser { CPDF_Dictionary* m_pLastCloneImageDict; FX_BOOL m_bReleaseLastDict; FX_BOOL m_bSameLastDict; - FX_BOOL m_bColored; + bool m_bColored; FX_FLOAT m_Type3Data[6]; FX_BOOL m_bResourceMissing; std::vector> m_StateStack; -- cgit v1.2.3