core/fpdfapi/fpdf_font/cpdf_font.cpp - Issue 2032613003: Get rid of NULLs in core/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: core/fpdfapi/fpdf_font/cpdf_font.cpp

Issue 2032613003: Get rid of NULLs in core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master

Patch Set: Fix a bad merge Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: 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 9fb54a828bec2b2eeedc6803433b835aaeb2ff09..78bdeeffaa63afab495d9eae8b93c8c5d7d7d65c 100644

--- a/core/fpdfapi/fpdf_font/cpdf_font.cpp

+++ b/core/fpdfapi/fpdf_font/cpdf_font.cpp

@@ -60,7 +60,7 @@ CPDF_Font::CPDF_Font()

CPDF_Font::~CPDF_Font() {

delete m_pToUnicodeMap;

- m_pToUnicodeMap = NULL;

+ m_pToUnicodeMap = nullptr;

if (m_pFontFile) {

m_pDocument->GetPageData()->ReleaseFontFileStreamAcc(

@@ -332,7 +332,7 @@ CPDF_Font* CPDF_Font::GetStockFont(CPDF_Document* pDoc,

pDict->SetAtName("Subtype", "Type1");

pDict->SetAtName("BaseFont", fontname);

pDict->SetAtName("Encoding", "WinAnsiEncoding");

- pFont = CPDF_Font::CreateFontF(NULL, pDict);

+ pFont = CPDF_Font::CreateFontF(nullptr, pDict);

pFontGlobals->Set(pDoc, font_id, pFont);

return pFont;

}