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/fpdfapi | |
| 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/fpdfapi')
| -rw-r--r-- | core/fpdfapi/font/cpdf_cidfont.cpp | 2 | ||||
| -rw-r--r-- | core/fpdfapi/render/cpdf_charposlist.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/fpdfapi/font/cpdf_cidfont.cpp b/core/fpdfapi/font/cpdf_cidfont.cpp index 49413d24f5..611afc0787 100644 --- a/core/fpdfapi/font/cpdf_cidfont.cpp +++ b/core/fpdfapi/font/cpdf_cidfont.cpp @@ -401,7 +401,7 @@ bool CPDF_CIDFont::Load() { if (!IsEmbedded()) LoadSubstFont(); - if (m_pFontFile || (GetSubstFont()->m_SubstFlags & FXFONT_SUBST_EXACT)) { + if (m_pFontFile || GetSubstFont()->m_bFlagExact) { CPDF_Object* pmap = pCIDFontDict->GetDirectObjectFor("CIDToGIDMap"); if (pmap) { if (CPDF_Stream* pStream = pmap->AsStream()) { diff --git a/core/fpdfapi/render/cpdf_charposlist.cpp b/core/fpdfapi/render/cpdf_charposlist.cpp index 16fb3c140c..5739c8af02 100644 --- a/core/fpdfapi/render/cpdf_charposlist.cpp +++ b/core/fpdfapi/render/cpdf_charposlist.cpp @@ -70,7 +70,7 @@ void CPDF_CharPosList::Load(const std::vector<uint32_t>& charCodes, float scalingFactor = 1.0f; if (!pFont->IsEmbedded() && pFont->HasFontWidths() && !bVertWriting && - !(pCurrentFont->GetSubstFont()->m_SubstFlags & FXFONT_SUBST_MM)) { + !pCurrentFont->GetSubstFont()->m_bFlagMM) { int pdfGlyphWidth = pFont->GetCharWidthF(CharCode); int ftGlyphWidth = pCurrentFont ? pCurrentFont->GetGlyphWidth(charpos.m_GlyphIndex) : 0; |