diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-28 11:51:24 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-28 20:39:56 +0000 |
| commit | dd0e6e1eba14c76dedd4b4e55ab47406856c9a76 (patch) | |
| tree | 36f27e3ec86b5c376d51bcd753cbdfbe3402e6c7 /core/fxge/cfx_substfont.h | |
| parent | 58418a24debb15019ec71eca193eff02c2a4846c (diff) | |
| download | pdfium-dd0e6e1eba14c76dedd4b4e55ab47406856c9a76.tar.xz | |
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 <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxge/cfx_substfont.h')
| -rw-r--r-- | core/fxge/cfx_substfont.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/core/fxge/cfx_substfont.h b/core/fxge/cfx_substfont.h index 5225bd38f3..2076a09093 100644 --- a/core/fxge/cfx_substfont.h +++ b/core/fxge/cfx_substfont.h @@ -9,21 +9,23 @@ #include "core/fxcrt/fx_string.h" -#define FXFONT_SUBST_MM 0x01 -#define FXFONT_SUBST_EXACT 0x40 - class CFX_SubstFont { public: CFX_SubstFont(); ByteString m_Family; int m_Charset; - uint32_t m_SubstFlags; int m_Weight; int m_ItalicAngle; - bool m_bSubstCJK; int m_WeightCJK; + bool m_bSubstCJK; bool m_bItalicCJK; + +#ifdef PDF_ENABLE_XFA + bool m_bFlagItalic; +#endif // PDF_ENABLE_XFA + bool m_bFlagMM; + bool m_bFlagExact; }; #endif // CORE_FXGE_CFX_SUBSTFONT_H_ |