diff options
| author | thestig <thestig@chromium.org> | 2016-06-07 10:46:22 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-07 10:46:23 -0700 |
| commit | 4997b22f84307521a62838f874928bf56cd3423c (patch) | |
| tree | ad11d99ac0a491ee222e9d0a42ec3b6ad3354e2a /core/fpdfapi/fpdf_font/cpdf_simplefont.cpp | |
| parent | 0687e76dc259c678b3f29a6608331f07ffd8f1e2 (diff) | |
| download | pdfium-4997b22f84307521a62838f874928bf56cd3423c.tar.xz | |
Get rid of NULLs in core/
Review-Url: https://codereview.chromium.org/2032613003
Diffstat (limited to 'core/fpdfapi/fpdf_font/cpdf_simplefont.cpp')
| -rw-r--r-- | core/fpdfapi/fpdf_font/cpdf_simplefont.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp b/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp index b367184e2e..129441625a 100644 --- a/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp +++ b/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp @@ -142,11 +142,11 @@ FX_BOOL CPDF_SimpleFont::LoadCommon() { m_BaseEncoding = PDFFONT_ENCODING_STANDARD; } CPDF_Object* pEncoding = m_pFontDict->GetDirectObjectBy("Encoding"); - LoadPDFEncoding(pEncoding, m_BaseEncoding, m_pCharNames, m_pFontFile != NULL, + LoadPDFEncoding(pEncoding, m_BaseEncoding, m_pCharNames, !!m_pFontFile, m_Font.IsTTFont()); LoadGlyphMap(); delete[] m_pCharNames; - m_pCharNames = NULL; + m_pCharNames = nullptr; if (!m_Font.GetFace()) return TRUE; @@ -189,8 +189,6 @@ void CPDF_SimpleFont::LoadSubstFont() { int weight = m_StemV < 140 ? m_StemV * 5 : (m_StemV * 4 + 140); m_Font.LoadSubst(m_BaseFont, IsTrueTypeFont(), m_Flags, weight, m_ItalicAngle, 0); - if (m_Font.GetSubstFont()->m_SubstFlags & FXFONT_SUBST_NONSYMBOL) { - } } FX_BOOL CPDF_SimpleFont::IsUnicodeCompatible() const { |