Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1550)

Unified Diff: core/src/fpdfapi/fpdf_render/fpdf_render.cpp

Issue 1520063002: Get rid of most instance of 'foo == NULL' (Closed) Base URL: https://pdfium.googlesource.com/pdfium@bstr_isnull
Patch Set: self review 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:
View side-by-side diff with in-line comments
Download patch
Index: core/src/fpdfapi/fpdf_render/fpdf_render.cpp
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
index 6b7ccfd43bb4d3fe6775b4a0be68e4568f3543a2..d7844a0564459c3a2b266d8bb022465009b8f193 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp
@@ -258,7 +258,7 @@ void CPDF_RenderStatus::RenderObjectList(const CPDF_PageObjects* pObjs,
if (!pCurObj) {
continue;
}
- if (pCurObj == NULL || pCurObj->m_Left > clip_rect.right ||
+ if (!pCurObj || pCurObj->m_Left > clip_rect.right ||
pCurObj->m_Right < clip_rect.left ||
pCurObj->m_Bottom > clip_rect.top ||
pCurObj->m_Top < clip_rect.bottom) {
@@ -361,7 +361,7 @@ FX_BOOL CPDF_RenderStatus::GetObjectClippedRect(
void CPDF_RenderStatus::DitherObjectArea(const CPDF_PageObject* pObj,
const CFX_AffineMatrix* pObj2Device) {
CFX_DIBitmap* pBitmap = m_pDevice->GetBitmap();
- if (pBitmap == NULL) {
+ if (!pBitmap) {
return;
}
FX_RECT rect;
@@ -693,7 +693,7 @@ void CPDF_RenderStatus::DrawClipPath(CPDF_ClipPath ClipPath,
int i;
for (i = 0; i < nClipPath; i++) {
const CFX_PathData* pPathData = ClipPath.GetPath(i);
- if (pPathData == NULL) {
+ if (!pPathData) {
continue;
}
CFX_GraphStateData stroke_state;
@@ -790,8 +790,8 @@ FX_BOOL CPDF_RenderStatus::ProcessTransparency(
pDocument->GetPageData()->ReleaseColorSpace(pCSObj);
}
}
- if (pSMaskDict == NULL && group_alpha == 1.0f &&
- blend_type == FXDIB_BLEND_NORMAL && !bTextClip && !bGroupTransparent) {
+ if (!pSMaskDict && group_alpha == 1.0f && blend_type == FXDIB_BLEND_NORMAL &&
+ !bTextClip && !bGroupTransparent) {
return FALSE;
}
FX_BOOL isolated = Transparency & PDFTRANS_ISOLATED;
@@ -848,7 +848,7 @@ FX_BOOL CPDF_RenderStatus::ProcessTransparency(
text_device.Attach(pTextMask.get());
for (FX_DWORD i = 0; i < pPageObj->m_ClipPath.GetTextCount(); i++) {
CPDF_TextObject* textobj = pPageObj->m_ClipPath.GetText(i);
- if (textobj == NULL) {
+ if (!textobj) {
break;
}
CFX_AffineMatrix text_matrix;
@@ -1090,7 +1090,7 @@ void CPDF_ProgressiveRenderer::Continue(IFX_Pause* pPause) {
for (; m_LayerIndex < nLayers; m_LayerIndex++) {
_PDF_RenderItem* pItem = m_pContext->m_ContentList.GetDataPtr(m_LayerIndex);
FX_POSITION LastPos = pItem->m_pObjectList->GetLastObjectPosition();
- if (m_ObjectPos == NULL) {
+ if (!m_ObjectPos) {
if (LastPos == m_PrevLastPos) {
if (!pItem->m_pObjectList->IsParsed()) {
pItem->m_pObjectList->ContinueParse(pPause);

Powered by Google App Engine
This is Rietveld 408576698