From 109975b30dbb2b047001a840b8a1e77434fce7b3 Mon Sep 17 00:00:00 2001 From: tsepez Date: Mon, 23 May 2016 13:28:43 -0700 Subject: Use unique_ptr in CPDF_CidFont Review-Url: https://codereview.chromium.org/2003833003 --- core/fpdfapi/fpdf_font/cpdf_cidfont.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'core/fpdfapi/fpdf_font/cpdf_cidfont.h') diff --git a/core/fpdfapi/fpdf_font/cpdf_cidfont.h b/core/fpdfapi/fpdf_font/cpdf_cidfont.h index 9beb7cb107..62840f847a 100644 --- a/core/fpdfapi/fpdf_font/cpdf_cidfont.h +++ b/core/fpdfapi/fpdf_font/cpdf_cidfont.h @@ -7,6 +7,8 @@ #ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_CIDFONT_H_ #define CORE_FPDFAPI_FPDF_FONT_CPDF_CIDFONT_H_ +#include + #include "core/fpdfapi/fpdf_font/include/cpdf_font.h" #include "core/fxcrt/include/fx_string.h" #include "core/fxcrt/include/fx_system.h" @@ -69,21 +71,21 @@ class CPDF_CIDFont : public CPDF_Font { FX_WCHAR GetUnicodeFromCharCode(uint32_t charcode) const; CPDF_CMap* m_pCMap; - CPDF_CMap* m_pAllocatedCMap; + std::unique_ptr m_pAllocatedCMap; CPDF_CID2UnicodeMap* m_pCID2UnicodeMap; CIDSet m_Charset; FX_BOOL m_bType1; - CPDF_StreamAcc* m_pCIDToGIDMap; FX_BOOL m_bCIDIsGID; uint16_t m_DefaultWidth; - uint16_t* m_pAnsiWidths; + std::unique_ptr m_pStreamAcc; + bool m_bAnsiWidthsFixed; FX_SMALL_RECT m_CharBBox[256]; CFX_ArrayTemplate m_WidthList; short m_DefaultVY; short m_DefaultW1; CFX_ArrayTemplate m_VertMetrics; FX_BOOL m_bAdobeCourierStd; - CFX_CTTGSUBTable* m_pTTGSUBTable; + std::unique_ptr m_pTTGSUBTable; }; #endif // CORE_FPDFAPI_FPDF_FONT_CPDF_CIDFONT_H_ -- cgit v1.2.3