From cd7b4ab7519c31a27c8d31e0cb694257fea84fd1 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 10 Apr 2018 21:49:05 +0000 Subject: Load CIDToGIDMap stream for CID fonts if it exists. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG=chromium:813705 Change-Id: I57265aad11d8f717f6ce33cc09241f4bef6381db Reviewed-on: https://pdfium-review.googlesource.com/29710 Reviewed-by: Nicolás Peña Moreno Commit-Queue: Lei Zhang --- core/fpdfapi/font/cpdf_cidfont.cpp | 21 +++++++-------------- 1 file 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(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(pStream); + m_pStreamAcc->LoadAllDataFiltered(); + } else if (m_pFontFile && pmap->GetString() == "Identity") { + m_bCIDIsGID = true; } } -- cgit v1.2.3