From 44105d862bfcaf9fce0ee0dfe283337bf5980337 Mon Sep 17 00:00:00 2001 From: weili Date: Wed, 6 Jul 2016 18:10:35 -0700 Subject: Change class member variables in raw pointer type into unique_ptr Also did some cleanups such as removing an unused member variables and some unused structs. BUG=pdfium:518 Review-Url: https://codereview.chromium.org/2119013002 --- core/fpdfapi/fpdf_font/cpdf_font.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'core/fpdfapi/fpdf_font/cpdf_font.cpp') diff --git a/core/fpdfapi/fpdf_font/cpdf_font.cpp b/core/fpdfapi/fpdf_font/cpdf_font.cpp index 061b477f17..07a79ed607 100644 --- a/core/fpdfapi/fpdf_font/cpdf_font.cpp +++ b/core/fpdfapi/fpdf_font/cpdf_font.cpp @@ -6,8 +6,6 @@ #include "core/fpdfapi/fpdf_font/include/cpdf_font.h" -#include - #include "core/fpdfapi/fpdf_font/cpdf_truetypefont.h" #include "core/fpdfapi/fpdf_font/cpdf_type1font.h" #include "core/fpdfapi/fpdf_font/cpdf_type3font.h" @@ -50,7 +48,6 @@ FX_BOOL GetPredefinedEncoding(int& basemap, const CFX_ByteString& value) { CPDF_Font::CPDF_Font() : m_pFontFile(nullptr), m_pFontDict(nullptr), - m_pToUnicodeMap(nullptr), m_bToUnicodeLoaded(FALSE), m_Flags(0), m_StemV(0), @@ -59,9 +56,6 @@ CPDF_Font::CPDF_Font() m_ItalicAngle(0) {} CPDF_Font::~CPDF_Font() { - delete m_pToUnicodeMap; - m_pToUnicodeMap = nullptr; - if (m_pFontFile) { m_pDocument->GetPageData()->ReleaseFontFileStreamAcc( const_cast(m_pFontFile->GetStream()->AsStream())); @@ -285,7 +279,7 @@ void CPDF_Font::LoadUnicodeMap() const { if (!pStream) { return; } - m_pToUnicodeMap = new CPDF_ToUnicodeMap; + m_pToUnicodeMap.reset(new CPDF_ToUnicodeMap); m_pToUnicodeMap->Load(pStream); } -- cgit v1.2.3