From 75a205f03fb755f4766ea674e470ff8de5d905b7 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 4 Oct 2017 14:54:32 -0400 Subject: Remove CPDF_CMap friends This CL removes the friends from CPDF_CMap and adds accessors for the needed items. Change-Id: Icf7b3e639c0904209f7db80c9460146cd29dd78a Reviewed-on: https://pdfium-review.googlesource.com/15452 Commit-Queue: dsinclair Reviewed-by: Henrique Nakashima --- core/fpdfapi/font/cpdf_cidfont.cpp | 34 +++++++++++++++++----------------- core/fpdfapi/font/cpdf_cmap.h | 23 ++++++++++++++++++++--- core/fpdfapi/font/cpdf_cmapparser.cpp | 18 +++++++++--------- 3 files changed, 46 insertions(+), 29 deletions(-) diff --git a/core/fpdfapi/font/cpdf_cidfont.cpp b/core/fpdfapi/font/cpdf_cidfont.cpp index be0f7b7cba..4eedf7db69 100644 --- a/core/fpdfapi/font/cpdf_cidfont.cpp +++ b/core/fpdfapi/font/cpdf_cidfont.cpp @@ -254,7 +254,7 @@ WideString CPDF_CIDFont::UnicodeFromCharCode(uint32_t charcode) const { } wchar_t CPDF_CIDFont::GetUnicodeFromCharCode(uint32_t charcode) const { - switch (m_pCMap->m_Coding) { + switch (m_pCMap->GetCoding()) { case CIDCODING_UCS2: case CIDCODING_UTF16: return static_cast(charcode); @@ -273,15 +273,15 @@ wchar_t CPDF_CIDFont::GetUnicodeFromCharCode(uint32_t charcode) const { charcode = (charcode % 256) * 256 + (charcode / 256); charsize = 2; } - int ret = FXSYS_MultiByteToWideChar(g_CharsetCPs[m_pCMap->m_Coding], 0, + int ret = FXSYS_MultiByteToWideChar(g_CharsetCPs[m_pCMap->GetCoding()], 0, reinterpret_cast(&charcode), charsize, &unicode, 1); return ret == 1 ? unicode : 0; #else - if (!m_pCMap->m_pEmbedMap) + if (!m_pCMap->GetEmbedMap()) return 0; - return EmbeddedUnicodeFromCharcode(m_pCMap->m_pEmbedMap, m_pCMap->m_Charset, - charcode); + return EmbeddedUnicodeFromCharcode(m_pCMap->GetEmbedMap(), + m_pCMap->GetCharset(), charcode); #endif } @@ -289,7 +289,7 @@ uint32_t CPDF_CIDFont::CharCodeFromUnicode(wchar_t unicode) const { uint32_t charcode = CPDF_Font::CharCodeFromUnicode(unicode); if (charcode) return charcode; - switch (m_pCMap->m_Coding) { + switch (m_pCMap->GetCoding()) { case CIDCODING_UNKNOWN: return 0; case CIDCODING_UCS2: @@ -312,21 +312,21 @@ uint32_t CPDF_CIDFont::CharCodeFromUnicode(wchar_t unicode) const { if (unicode < 0x80) return static_cast(unicode); - if (m_pCMap->m_Coding == CIDCODING_CID) + if (m_pCMap->GetCoding() == CIDCODING_CID) return 0; #if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ uint8_t buffer[32]; int ret = FXSYS_WideCharToMultiByte( - g_CharsetCPs[m_pCMap->m_Coding], 0, &unicode, 1, + g_CharsetCPs[m_pCMap->GetCoding()], 0, &unicode, 1, reinterpret_cast(buffer), 4, nullptr, nullptr); if (ret == 1) return buffer[0]; if (ret == 2) return buffer[0] * 256 + buffer[1]; #else - if (m_pCMap->m_pEmbedMap) { - return EmbeddedCharcodeFromUnicode(m_pCMap->m_pEmbedMap, m_pCMap->m_Charset, - unicode); + if (m_pCMap->GetEmbedMap()) { + return EmbeddedCharcodeFromUnicode(m_pCMap->GetEmbedMap(), + m_pCMap->GetCharset(), unicode); } #endif return 0; @@ -381,7 +381,7 @@ bool CPDF_CIDFont::Load() { return false; } - m_Charset = m_pCMap->m_Charset; + m_Charset = m_pCMap->GetCharset(); if (m_Charset == CIDSET_UNKNOWN) { CPDF_Dictionary* pCIDInfo = pCIDFontDict->GetDictFor("CIDSystemInfo"); if (pCIDInfo) { @@ -390,7 +390,7 @@ bool CPDF_CIDFont::Load() { } } if (m_Charset != CIDSET_UNKNOWN) { - bool bPromptCJK = !m_pFontFile && (m_pCMap->m_Coding == CIDCODING_CID || + bool bPromptCJK = !m_pFontFile && (m_pCMap->GetCoding() == CIDCODING_CID || pCIDFontDict->KeyExist("W")); m_pCID2UnicodeMap = manager->GetCID2UnicodeMap(m_Charset, bPromptCJK); } @@ -398,7 +398,7 @@ bool CPDF_CIDFont::Load() { if (m_bType1) FXFT_Select_Charmap(m_Font.GetFace(), FXFT_ENCODING_UNICODE); else - FT_UseCIDCharmap(m_Font.GetFace(), m_pCMap->m_Coding); + FT_UseCIDCharmap(m_Font.GetFace(), m_pCMap->GetCoding()); } m_DefaultWidth = pCIDFontDict->GetIntegerFor("DW", 1000); CPDF_Array* pWidthArray = pCIDFontDict->GetArrayFor("W"); @@ -727,9 +727,9 @@ int CPDF_CIDFont::GlyphFromCharCode(uint32_t charcode, bool* pVertGlyph) { if (!m_pStreamAcc) { if (m_bType1) return cid; - if (m_pFontFile && m_pCMap->m_DirectCharcodeToCIDTable.empty()) + if (m_pFontFile && m_pCMap->IsDirectCharcodeToCIDTableIsEmpty()) return cid; - if (m_pCMap->m_Coding == CIDCODING_UNKNOWN || + if (m_pCMap->GetCoding() == CIDCODING_UNKNOWN || !FXFT_Get_Face_Charmap(m_Font.GetFace())) { return cid; } @@ -772,7 +772,7 @@ int CPDF_CIDFont::AppendChar(char* str, uint32_t charcode) const { bool CPDF_CIDFont::IsUnicodeCompatible() const { if (m_pCID2UnicodeMap && m_pCID2UnicodeMap->IsLoaded() && m_pCMap->IsLoaded()) return true; - return m_pCMap->m_Coding != CIDCODING_UNKNOWN; + return m_pCMap->GetCoding() != CIDCODING_UNKNOWN; } void CPDF_CIDFont::LoadSubstFont() { diff --git a/core/fpdfapi/font/cpdf_cmap.h b/core/fpdfapi/font/cpdf_cmap.h index 493d30097a..98a77286d0 100644 --- a/core/fpdfapi/font/cpdf_cmap.h +++ b/core/fpdfapi/font/cpdf_cmap.h @@ -57,16 +57,33 @@ class CPDF_CMap : public Retainable { bool IsLoaded() const { return m_bLoaded; } bool IsVertWriting() const { return m_bVertical; } + uint16_t CIDFromCharCode(uint32_t charcode) const; + int GetCharSize(uint32_t charcode) const; uint32_t GetNextChar(const char* pString, int nStrLen, int& offset) const; int CountChar(const char* pString, int size) const; int AppendChar(char* str, uint32_t charcode) const; - private: - friend class CPDF_CMapParser; - friend class CPDF_CIDFont; + void SetVertical(bool vert) { m_bVertical = vert; } + void SetCodingScheme(CodingScheme scheme) { m_CodingScheme = scheme; } + void SetMixedFourByteLeadingRanges(std::vector range) { + m_MixedFourByteLeadingRanges = range; + } + int GetCoding() const { return m_Coding; } + const FXCMAP_CMap* GetEmbedMap() const { return m_pEmbedMap; } + CIDSet GetCharset() const { return m_Charset; } + void SetCharset(CIDSet set) { m_Charset = set; } + + void SetDirectCharcodeToCIDTable(size_t idx, uint16_t val) { + m_DirectCharcodeToCIDTable[idx] = val; + } + bool IsDirectCharcodeToCIDTableIsEmpty() const { + return m_DirectCharcodeToCIDTable.empty(); + } + + private: CPDF_CMap(); ~CPDF_CMap() override; diff --git a/core/fpdfapi/font/cpdf_cmapparser.cpp b/core/fpdfapi/font/cpdf_cmapparser.cpp index a5d79776ba..4c74761ec9 100644 --- a/core/fpdfapi/font/cpdf_cmapparser.cpp +++ b/core/fpdfapi/font/cpdf_cmapparser.cpp @@ -90,8 +90,8 @@ void CPDF_CMapParser::ParseWord(const ByteStringView& word) { } if (EndCode < 0x10000) { for (uint32_t code = StartCode; code <= EndCode; code++) { - m_pCMap->m_DirectCharcodeToCIDTable[code] = - static_cast(StartCID + code - StartCode); + m_pCMap->SetDirectCharcodeToCIDTable( + code, static_cast(StartCID + code - StartCode)); } } else { m_AdditionalCharcodeToCIDMappings.push_back( @@ -101,23 +101,23 @@ void CPDF_CMapParser::ParseWord(const ByteStringView& word) { } else if (m_Status == 3) { m_Status = 0; } else if (m_Status == 4) { - m_pCMap->m_Charset = CharsetFromOrdering(CMap_GetString(word)); + m_pCMap->SetCharset(CharsetFromOrdering(CMap_GetString(word))); m_Status = 0; } else if (m_Status == 5) { m_Status = 0; } else if (m_Status == 6) { - m_pCMap->m_bVertical = CMap_GetCode(word) != 0; + m_pCMap->SetVertical(CMap_GetCode(word) != 0); m_Status = 0; } else if (m_Status == 7) { if (word == "endcodespacerange") { uint32_t nSegs = pdfium::CollectionSize(m_CodeRanges); if (nSegs > 1) { - m_pCMap->m_CodingScheme = CPDF_CMap::MixedFourBytes; - m_pCMap->m_MixedFourByteLeadingRanges = m_CodeRanges; + m_pCMap->SetCodingScheme(CPDF_CMap::MixedFourBytes); + m_pCMap->SetMixedFourByteLeadingRanges(m_CodeRanges); } else if (nSegs == 1) { - m_pCMap->m_CodingScheme = (m_CodeRanges[0].m_CharSize == 2) - ? CPDF_CMap::TwoBytes - : CPDF_CMap::OneByte; + m_pCMap->SetCodingScheme((m_CodeRanges[0].m_CharSize == 2) + ? CPDF_CMap::TwoBytes + : CPDF_CMap::OneByte); } m_Status = 0; } else { -- cgit v1.2.3