| Index: core/fpdfapi/fpdf_font/cpdf_simplefont.cpp
|
| diff --git a/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp b/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp
|
| index b367184e2e52822fca4de93c62ff2b0148897522..129441625a8df156579b4ca88d9fb351e4c48d39 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 {
|
|
|