summaryrefslogtreecommitdiff
path: root/core/fpdfapi/fpdf_font/cpdf_font.cpp
diff options
context:
space:
mode:
authorweili <weili@chromium.org>2016-07-06 18:10:35 -0700
committerCommit bot <commit-bot@chromium.org>2016-07-06 18:10:35 -0700
commit44105d862bfcaf9fce0ee0dfe283337bf5980337 (patch)
tree9c4f3e31b7c1e7ec0ea6eff56c1b81407ce79870 /core/fpdfapi/fpdf_font/cpdf_font.cpp
parent2f6d1480a1be2b1f82c94219c2d99e67d7e0660d (diff)
downloadpdfium-44105d862bfcaf9fce0ee0dfe283337bf5980337.tar.xz
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
Diffstat (limited to 'core/fpdfapi/fpdf_font/cpdf_font.cpp')
-rw-r--r--core/fpdfapi/fpdf_font/cpdf_font.cpp8
1 files changed, 1 insertions, 7 deletions
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 <memory>
-
#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<CPDF_Stream*>(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);
}