diff options
-rw-r--r-- | core/fpdfapi/font/cpdf_cidfont.cpp | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/core/fpdfapi/font/cpdf_cidfont.cpp b/core/fpdfapi/font/cpdf_cidfont.cpp index 4d3ffdf41f..77cc6735b5 100644 --- a/core/fpdfapi/font/cpdf_cidfont.cpp +++ b/core/fpdfapi/font/cpdf_cidfont.cpp @@ -407,20 +407,13 @@ bool CPDF_CIDFont::Load() { if (!IsEmbedded()) LoadSubstFont(); - if (m_pFontFile) { - CPDF_Object* pmap = pCIDFontDict->GetDirectObjectFor("CIDToGIDMap"); - if (pmap) { - if (CPDF_Stream* pStream = pmap->AsStream()) { - m_pStreamAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pStream); - m_pStreamAcc->LoadAllDataFiltered(); - } else if (pmap->GetString() == "Identity") { -#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ - if (m_pFontFile) - m_bCIDIsGID = true; -#else - m_bCIDIsGID = true; -#endif - } + CPDF_Object* pmap = pCIDFontDict->GetDirectObjectFor("CIDToGIDMap"); + if (pmap) { + if (CPDF_Stream* pStream = pmap->AsStream()) { + m_pStreamAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pStream); + m_pStreamAcc->LoadAllDataFiltered(); + } else if (m_pFontFile && pmap->GetString() == "Identity") { + m_bCIDIsGID = true; } } |