core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.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_loadimage.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_loadimage.cpp

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

index 70d2340c225a064b8328cd62bbeeb62e001524a4..521ec16be183c6df2bcff2ad7db08aa7da32a9c7 100644

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

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

@@ -788,7 +788,7 @@ int CPDF_DIBSource::StratLoadMask() {

m_pMaskStream = m_pDict->GetStream("SMask");

if (m_pMaskStream) {

CPDF_Array* pMatte = m_pMaskStream->GetDict()->GetArray("Matte");

- if (pMatte != NULL && m_pColorSpace &&

+ if (pMatte && m_pColorSpace &&

(FX_DWORD)m_pColorSpace->CountComponents() <= m_nComponents) {

FX_FLOAT R, G, B;

FX_FLOAT* pColor = FX_Alloc(FX_FLOAT, m_nComponents);