From 96660d6f382204339d6b1aadc3913303d436e252 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 14 Dec 2015 18:27:25 -0800 Subject: Merge to XFA: Get rid of most instance of 'foo != NULL' TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1512763013 . (cherry picked from commit e3c7c2b54348da4a6939f6672f6c6bff126815a7) Review URL: https://codereview.chromium.org/1529553003 . --- core/src/fxge/ge/fx_ge_ps.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/src/fxge/ge/fx_ge_ps.cpp') diff --git a/core/src/fxge/ge/fx_ge_ps.cpp b/core/src/fxge/ge/fx_ge_ps.cpp index 6ce8f4635b..ceb2acf2bc 100644 --- a/core/src/fxge/ge/fx_ge_ps.cpp +++ b/core/src/fxge/ge/fx_ge_ps.cpp @@ -417,7 +417,7 @@ FX_BOOL CFX_PSRenderer::DrawDIBits(const CFX_DIBSource* pSource, pConverted = pSource->CloneConvert(FXDIB_Rgb); break; case FXDIB_8bppRgb: - if (pSource->GetPalette() != NULL) { + if (pSource->GetPalette()) { pConverted = pSource->CloneConvert(FXDIB_Rgb); } break; @@ -425,7 +425,7 @@ FX_BOOL CFX_PSRenderer::DrawDIBits(const CFX_DIBSource* pSource, pConverted = pSource->CloneConvert(FXDIB_Cmyk); break; case FXDIB_8bppCmyk: - if (pSource->GetPalette() != NULL) { + if (pSource->GetPalette()) { pConverted = pSource->CloneConvert(FXDIB_Cmyk); } break; -- cgit v1.2.3