diff options
| -rw-r--r-- | core/fpdfapi/fpdf_font/font_int.h | 5 | ||||
| -rw-r--r-- | core/fpdfapi/fpdf_font/fpdf_font_cid.cpp | 11 |
2 files changed, 0 insertions, 16 deletions
diff --git a/core/fpdfapi/fpdf_font/font_int.h b/core/fpdfapi/fpdf_font/font_int.h index e4689bfd74..26415b1013 100644 --- a/core/fpdfapi/fpdf_font/font_int.h +++ b/core/fpdfapi/fpdf_font/font_int.h @@ -32,13 +32,11 @@ class CPDF_CMapManager { void* GetPackage(FX_BOOL bPrompt); CPDF_CMap* GetPredefinedCMap(const CFX_ByteString& name, FX_BOOL bPromptCJK); CPDF_CID2UnicodeMap* GetCID2UnicodeMap(CIDSet charset, FX_BOOL bPromptCJK); - void ReloadAll(); private: CPDF_CMap* LoadPredefinedCMap(const CFX_ByteString& name, FX_BOOL bPromptCJK); CPDF_CID2UnicodeMap* LoadCID2UnicodeMap(CIDSet charset, FX_BOOL bPromptCJK); - FX_BOOL m_bPrompted; std::map<CFX_ByteString, CPDF_CMap*> m_CMaps; CPDF_CID2UnicodeMap* m_CID2UnicodeMaps[6]; }; @@ -109,9 +107,6 @@ class CPDF_CMapParser { int m_CodeSeq; uint32_t m_CodePoints[4]; CFX_ArrayTemplate<CMap_CodeRange> m_CodeRanges; - CFX_ByteString m_Registry; - CFX_ByteString m_Ordering; - CFX_ByteString m_Supplement; CFX_ByteString m_LastWord; }; diff --git a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp index 457f8eec3e..3f95ec4a96 100644 --- a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp +++ b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp @@ -279,7 +279,6 @@ int GetCharSizeImpl(uint32_t charcode, } // namespace CPDF_CMapManager::CPDF_CMapManager() { - m_bPrompted = FALSE; FXSYS_memset(m_CID2UnicodeMaps, 0, sizeof m_CID2UnicodeMaps); } CPDF_CMapManager::~CPDF_CMapManager() { @@ -314,16 +313,6 @@ CPDF_CMap* CPDF_CMapManager::LoadPredefinedCMap(const CFX_ByteString& name, return pCMap; } -void CPDF_CMapManager::ReloadAll() { - for (const auto& pair : m_CMaps) - pair.second->LoadPredefined(this, pair.first, FALSE); - - for (size_t i = 0; i < FX_ArraySize(m_CID2UnicodeMaps); ++i) { - if (CPDF_CID2UnicodeMap* pMap = m_CID2UnicodeMaps[i]) { - pMap->Load(this, CIDSetFromSizeT(i), FALSE); - } - } -} CPDF_CID2UnicodeMap* CPDF_CMapManager::GetCID2UnicodeMap(CIDSet charset, FX_BOOL bPromptCJK) { if (!m_CID2UnicodeMaps[charset]) |