From dd0e6e1eba14c76dedd4b4e55ab47406856c9a76 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 28 Sep 2017 11:51:24 -0400 Subject: Cleanup font defines This CL removes duplicate defines between XFA and core. Several OR'd values have been coverted into individual booleans to make the code clearer. Change-Id: Ic32a71c711cffd9a0cf1136e5a22f0502e085c39 Reviewed-on: https://pdfium-review.googlesource.com/15071 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- xfa/fgas/font/cfgas_gefont.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'xfa/fgas/font/cfgas_gefont.h') diff --git a/xfa/fgas/font/cfgas_gefont.h b/xfa/fgas/font/cfgas_gefont.h index a1d6b82cb6..2e63ee5367 100644 --- a/xfa/fgas/font/cfgas_gefont.h +++ b/xfa/fgas/font/cfgas_gefont.h @@ -18,8 +18,6 @@ #include "xfa/fgas/font/cfgas_fontmgr.h" #include "xfa/fgas/font/cfgas_pdffontmgr.h" -#define FXFONT_SUBST_ITALIC 0x02 - class CFGAS_FontMgr; class CFX_UnicodeEncoding; @@ -77,9 +75,9 @@ class CFGAS_GEFont : public Retainable { bool LoadFontInternal(const uint8_t* pBuffer, int32_t length); bool LoadFontInternal(const RetainPtr& pFontStream, bool bSaveStream); -#endif - bool LoadFontInternal(CFX_Font* pExternalFont); +#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ bool LoadFontInternal(std::unique_ptr pInternalFont); + bool LoadFontInternal(CFX_Font* pExternalFont); bool InitFont(); std::pair> GetGlyphIndexAndFont( wchar_t wUnicode, -- cgit v1.2.3