From decfa7b0447538dec6cbcfa8ea50481f2173ce12 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 23 Jun 2016 08:17:59 -0700 Subject: Remove FPDFAPI_LoadCID2UnicodeMap. This Cl removes FPDFAPI_LoadCID2UnicodeMap() and inlines the code into the one caller. Review-Url: https://codereview.chromium.org/2097513002 --- core/fpdfapi/fpdf_font/fpdf_font_cid.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'core/fpdfapi/fpdf_font/fpdf_font_cid.cpp') diff --git a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp index efc5e7cedc..289782bfb3 100644 --- a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp +++ b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp @@ -8,6 +8,7 @@ #include "core/fpdfapi/fpdf_cmaps/cmap_int.h" #include "core/fpdfapi/fpdf_font/ttgsubtable.h" +#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h" @@ -794,7 +795,11 @@ void CPDF_CID2UnicodeMap::Load(CPDF_CMapManager* pMgr, CIDSet charset, FX_BOOL bPromptCJK) { m_Charset = charset; - FPDFAPI_LoadCID2UnicodeMap(charset, m_pEmbeddedMap, m_EmbeddedCount); + + CPDF_FontGlobals* pFontGlobals = + CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals(); + m_pEmbeddedMap = pFontGlobals->m_EmbeddedToUnicodes[charset].m_pMap; + m_EmbeddedCount = pFontGlobals->m_EmbeddedToUnicodes[charset].m_Count; } CIDSet CharsetFromOrdering(const CFX_ByteStringC& ordering) { -- cgit v1.2.3