diff options
Diffstat (limited to 'core/fxge')
| -rw-r--r-- | core/fxge/ge/cfx_font.cpp | 14 | ||||
| -rw-r--r-- | core/fxge/include/fx_font.h | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/core/fxge/ge/cfx_font.cpp b/core/fxge/ge/cfx_font.cpp index b184711211..ce77cbf661 100644 --- a/core/fxge/ge/cfx_font.cpp +++ b/core/fxge/ge/cfx_font.cpp @@ -233,8 +233,8 @@ CFX_Font::CFX_Font() #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ m_pPlatformFont(nullptr), #endif - m_bEmbedded(FALSE), - m_bVertical(FALSE) { + m_bEmbedded(false), + m_bVertical(false) { } #ifdef PDF_ENABLE_XFA @@ -316,8 +316,8 @@ void CFX_Font::LoadSubst(const CFX_ByteString& face_name, int weight, int italic_angle, int CharsetCP, - FX_BOOL bVertical) { - m_bEmbedded = FALSE; + bool bVertical) { + m_bEmbedded = false; m_bVertical = bVertical; m_pSubstFont.reset(new CFX_SubstFont); m_Face = CFX_GEModule::Get()->GetFontMgr()->FindSubstFont( @@ -371,14 +371,14 @@ FX_BOOL CFX_Font::LoadEmbedded(const uint8_t* data, uint32_t size) { m_pFontDataAllocation.swap(temp); m_Face = FT_LoadFont(m_pFontDataAllocation.data(), size); m_pFontData = m_pFontDataAllocation.data(); - m_bEmbedded = TRUE; + m_bEmbedded = true; m_dwSize = size; return !!m_Face; } -FX_BOOL CFX_Font::IsTTFont() const { +bool CFX_Font::IsTTFont() const { if (!m_Face) - return FALSE; + return false; return FXFT_Is_Face_TT_OT(m_Face) == FXFT_FACE_FLAG_SFNT; } diff --git a/core/fxge/include/fx_font.h b/core/fxge/include/fx_font.h index 58d12bbb2a..5a83130551 100644 --- a/core/fxge/include/fx_font.h +++ b/core/fxge/include/fx_font.h @@ -103,7 +103,7 @@ class CFX_Font { int weight, int italic_angle, int CharsetCP, - FX_BOOL bVertical = FALSE); + bool bVertical); FX_BOOL LoadEmbedded(const uint8_t* data, uint32_t size); FXFT_Face GetFace() const { return m_Face; } @@ -140,11 +140,11 @@ class CFX_Font { bool IsItalic() const; bool IsBold() const; bool IsFixedWidth() const; - FX_BOOL IsVertical() const { return m_bVertical; } + bool IsVertical() const { return m_bVertical; } CFX_ByteString GetPsName() const; CFX_ByteString GetFamilyName() const; CFX_ByteString GetFaceName() const; - FX_BOOL IsTTFont() const; + bool IsTTFont() const; FX_BOOL GetBBox(FX_RECT& bbox); int GetHeight() const; int GetULPos() const; @@ -198,8 +198,8 @@ class CFX_Font { #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ void* m_pPlatformFont; #endif - FX_BOOL m_bEmbedded; - FX_BOOL m_bVertical; + bool m_bEmbedded; + bool m_bVertical; }; class CFX_FontFaceInfo { |