diff options
Diffstat (limited to 'core/fpdfapi/font')
-rw-r--r-- | core/fpdfapi/font/cpdf_cidfont.cpp | 4 | ||||
-rw-r--r-- | core/fpdfapi/font/cpdf_cmap.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/fpdfapi/font/cpdf_cidfont.cpp b/core/fpdfapi/font/cpdf_cidfont.cpp index 98478c378a..03442b5897 100644 --- a/core/fpdfapi/font/cpdf_cidfont.cpp +++ b/core/fpdfapi/font/cpdf_cidfont.cpp @@ -150,7 +150,7 @@ wchar_t EmbeddedUnicodeFromCharcode(const FXCMAP_CMap* pEmbedMap, if (!IsValidEmbeddedCharcodeFromUnicodeCharset(charset)) return 0; - uint16_t cid = FPDFAPI_CIDFromCharCode(pEmbedMap, charcode); + uint16_t cid = CIDFromCharCode(pEmbedMap, charcode); if (!cid) return 0; @@ -169,7 +169,7 @@ uint32_t EmbeddedCharcodeFromUnicode(const FXCMAP_CMap* pEmbedMap, GetFontGlobals()->GetEmbeddedToUnicode(charset); for (uint32_t i = 0; i < map.size(); ++i) { if (map[i] == unicode) { - uint32_t charCode = FPDFAPI_CharCodeFromCID(pEmbedMap, i); + uint32_t charCode = CharCodeFromCID(pEmbedMap, i); if (charCode) return charCode; } diff --git a/core/fpdfapi/font/cpdf_cmap.cpp b/core/fpdfapi/font/cpdf_cmap.cpp index 3e5732215d..97a8ed2700 100644 --- a/core/fpdfapi/font/cpdf_cmap.cpp +++ b/core/fpdfapi/font/cpdf_cmap.cpp @@ -282,7 +282,7 @@ void CPDF_CMap::LoadPredefined(CPDF_CMapManager* pMgr, m_MixedTwoByteLeadingBytes[b] = true; } } - m_pEmbedMap = FPDFAPI_FindEmbeddedCMap(bsName, m_Charset, m_Coding); + m_pEmbedMap = FindEmbeddedCMap(bsName, m_Charset, m_Coding); if (!m_pEmbedMap) return; @@ -316,7 +316,7 @@ uint16_t CPDF_CMap::CIDFromCharCode(uint32_t charcode) const { return static_cast<uint16_t>(charcode); if (m_pEmbedMap) - return FPDFAPI_CIDFromCharCode(m_pEmbedMap.Get(), charcode); + return ::CIDFromCharCode(m_pEmbedMap.Get(), charcode); if (m_DirectCharcodeToCIDTable.empty()) return static_cast<uint16_t>(charcode); |