diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-28 15:59:42 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-28 20:40:36 +0000 |
| commit | 10e1f05a9e644cd954792bcd40ef787551cbd209 (patch) | |
| tree | d203254a0a2c856a9b8ba5a0445a883c7072dd77 /core/fpdfapi/font/cpdf_type1font.cpp | |
| parent | dd0e6e1eba14c76dedd4b4e55ab47406856c9a76 (diff) | |
| download | pdfium-10e1f05a9e644cd954792bcd40ef787551cbd209.tar.xz | |
Cleanup font defines
Use methods to match font information; cleanup some font code.
Change-Id: Ib99c1e466e56723cb5d264d49e1caf9bbbc0daed
Reviewed-on: https://pdfium-review.googlesource.com/15072
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfapi/font/cpdf_type1font.cpp')
| -rw-r--r-- | core/fpdfapi/font/cpdf_type1font.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/fpdfapi/font/cpdf_type1font.cpp b/core/fpdfapi/font/cpdf_type1font.cpp index 296351fc82..9975943d9a 100644 --- a/core/fpdfapi/font/cpdf_type1font.cpp +++ b/core/fpdfapi/font/cpdf_type1font.cpp @@ -93,7 +93,7 @@ bool CPDF_Type1Font::Load() { m_BaseEncoding = PDFFONT_ENCODING_ADOBE_SYMBOL; else if (m_Base14Font == 13) m_BaseEncoding = PDFFONT_ENCODING_ZAPFDINGBATS; - else if (m_Flags & FXFONT_NONSYMBOLIC) + else if (FontStyleIsNonSymbolic(m_Flags)) m_BaseEncoding = PDFFONT_ENCODING_STANDARD; } return LoadCommon(); @@ -188,7 +188,7 @@ void CPDF_Type1Font::LoadGlyphMap() { FT_UseType1Charmap(m_Font.GetFace()); #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ if (bCoreText) { - if (m_Flags & FXFONT_SYMBOLIC) { + if (FontStyleIsSymbolic(m_Flags)) { for (int charcode = 0; charcode < 256; charcode++) { const char* name = GetAdobeCharName(m_BaseEncoding, m_CharNames, charcode); @@ -255,7 +255,7 @@ void CPDF_Type1Font::LoadGlyphMap() { return; } #endif // _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ - if (m_Flags & FXFONT_SYMBOLIC) { + if (FontStyleIsSymbolic(m_Flags)) { for (int charcode = 0; charcode < 256; charcode++) { const char* name = GetAdobeCharName(m_BaseEncoding, m_CharNames, charcode); |