core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp - Issue 1512763013: 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_edit/fpdf_edit_image.cpp

Issue 1512763013: Get rid of most instance of 'foo != NULL' (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master

Patch Set: nits 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_edit/fpdf_edit_image.cpp

diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp

index ccb184c6cf9b41dd326a6cbdb47f1ca0c936bc5f..640e8671f8cfbc4db6edbb82cc8478401a481f37 100644

--- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp

+++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp

@@ -259,7 +259,7 @@ void CPDF_Image::SetImage(const CFX_DIBitmap* pBitmap,

delete pMaskBitmap;

}

- FX_BOOL bStream = pFileWrite != NULL && pFileRead != NULL;

+ FX_BOOL bStream = pFileWrite && pFileRead;

if (opType == 0) {

if (iCompress & PDF_IMAGE_LOSSLESS_COMPRESS) {

if (pBitmap->GetBPP() == 1) {

@@ -270,7 +270,7 @@ void CPDF_Image::SetImage(const CFX_DIBitmap* pBitmap,

if (pBitmap->GetBPP() == 1) {

_JBIG2EncodeBitmap(pDict, pBitmap, m_pDocument, dest_buf, dest_size,

FALSE);

- } else if (pBitmap->GetBPP() >= 8 && pBitmap->GetPalette() != NULL) {

+ } else if (pBitmap->GetBPP() >= 8 && pBitmap->GetPalette()) {

CFX_DIBitmap* pNewBitmap = new CFX_DIBitmap();

pNewBitmap->Copy(pBitmap);

pNewBitmap->ConvertFormat(FXDIB_Rgb);