From 5eca305b1586b2107566a5c124baa5f2e00096c0 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 22 Feb 2016 20:32:21 -0800 Subject: Remove foo != NULL outside of xfa/ Most of these are from the XFA branch. R=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1720043003 . --- core/src/fpdfdoc/doc_form.cpp | 2 +- core/src/fpdfdoc/doc_tagged.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'core/src/fpdfdoc') diff --git a/core/src/fpdfdoc/doc_form.cpp b/core/src/fpdfdoc/doc_form.cpp index 9252e073e0..f40f447a68 100644 --- a/core/src/fpdfdoc/doc_form.cpp +++ b/core/src/fpdfdoc/doc_form.cpp @@ -393,7 +393,7 @@ static FX_BOOL RetrieveStockFont(int iFontObject, uint8_t charSet, LOGFONTA& lf) { HFONT hFont = (HFONT)::GetStockObject(iFontObject); - if (hFont != NULL) { + if (hFont) { memset(&lf, 0, sizeof(LOGFONTA)); int iRet = ::GetObject(hFont, sizeof(LOGFONTA), &lf); if (iRet > 0 && (lf.lfCharSet == charSet || charSet == 255)) { diff --git a/core/src/fpdfdoc/doc_tagged.cpp b/core/src/fpdfdoc/doc_tagged.cpp index e16d852ccb..a7eea11b02 100644 --- a/core/src/fpdfdoc/doc_tagged.cpp +++ b/core/src/fpdfdoc/doc_tagged.cpp @@ -13,7 +13,7 @@ const int nMaxRecursion = 32; static FX_BOOL IsTagged(const CPDF_Document* pDoc) { CPDF_Dictionary* pCatalog = pDoc->GetRoot(); CPDF_Dictionary* pMarkInfo = pCatalog->GetDictBy("MarkInfo"); - return pMarkInfo != NULL && pMarkInfo->GetIntegerBy("Marked"); + return pMarkInfo && pMarkInfo->GetIntegerBy("Marked"); } CPDF_StructTree* CPDF_StructTree::LoadPage(const CPDF_Document* pDoc, const CPDF_Dictionary* pPageDict) { -- cgit v1.2.3