core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp - Issue 1529553003: Merge to XFA: Get rid of most instance of 'foo != NULL'

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/src/fpdfapi/fpdf_render/fpdf_render_text.cpp

Issue 1529553003: Merge to XFA: Get rid of most instance of 'foo != NULL' (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: Created 5 years 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/src/fpdfapi/fpdf_render/fpdf_render_text.cpp

diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp

index 3a5605829530c8a9a0390deace76c14bfc4a3edc..774e7493222bbc79df147a3d315301007c3b038f 100644

--- a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp

+++ b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp

@@ -313,7 +313,7 @@ static void ReleaseCachedType3(CPDF_Type3Font* pFont) {

pFont->m_pDocument->GetPageData()->ReleaseFont(pFont->GetFontDict());

}

FX_BOOL CPDF_Type3Char::LoadBitmap(CPDF_RenderContext* pContext) {

- if (m_pBitmap != NULL || m_pForm == NULL) {

+ if (m_pBitmap || m_pForm == NULL) {

return TRUE;

}

if (m_pForm->CountObjects() == 1 && !m_bColored) {