Index: core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp |
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp |
index 34877a866a8f2cfe8c1700caccaa13e2033a5c5c..9e4265ee75eb1771c42b6076fbfed9b8115f1984 100644 |
--- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp |
+++ b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp |
@@ -1038,17 +1038,18 @@ void CPDF_CID2UnicodeMap::Load(CPDF_CMapManager* pMgr, |
FPDFAPI_LoadCID2UnicodeMap(charset, m_pEmbeddedMap, m_EmbeddedCount); |
} |
-CPDF_CIDFont::CPDF_CIDFont() : CPDF_Font(PDFFONT_CIDFONT) { |
- m_pCMap = NULL; |
- m_pAllocatedCMap = NULL; |
- m_pCID2UnicodeMap = NULL; |
- m_pAnsiWidths = NULL; |
- m_pCIDToGIDMap = NULL; |
- m_bCIDIsGID = FALSE; |
- m_bAdobeCourierStd = FALSE; |
- m_pTTGSUBTable = NULL; |
+CPDF_CIDFont::CPDF_CIDFont() |
+ : m_pCMap(nullptr), |
+ m_pAllocatedCMap(nullptr), |
+ m_pCID2UnicodeMap(nullptr), |
+ m_pCIDToGIDMap(nullptr), |
+ m_bCIDIsGID(FALSE), |
+ m_pAnsiWidths(nullptr), |
+ m_bAdobeCourierStd(FALSE), |
+ m_pTTGSUBTable(nullptr) { |
FXSYS_memset(m_CharBBox, 0xff, 256 * sizeof(FX_SMALL_RECT)); |
} |
+ |
CPDF_CIDFont::~CPDF_CIDFont() { |
if (m_pAnsiWidths) { |
FX_Free(m_pAnsiWidths); |
@@ -1057,12 +1058,14 @@ CPDF_CIDFont::~CPDF_CIDFont() { |
delete m_pCIDToGIDMap; |
delete m_pTTGSUBTable; |
} |
+ |
FX_WORD CPDF_CIDFont::CIDFromCharCode(FX_DWORD charcode) const { |
if (!m_pCMap) { |
return (FX_WORD)charcode; |
} |
return m_pCMap->CIDFromCharCode(charcode); |
} |
+ |
FX_BOOL CPDF_CIDFont::IsVertWriting() const { |
return m_pCMap ? m_pCMap->IsVertWriting() : FALSE; |
} |