Get rid of most instance of 'foo == NULL'

core/src/fpdfdoc/doc_ap.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/include/fpdfdoc/fpdf_ap.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
 #include "core/include/fpdfdoc/fpdf_vt.h"
 #include "doc_utils.h"
@@ skipping 274 matching lines @@
   CFX_ByteString sFontName = syntax.GetWord();
   sFontName = PDF_NameDecode(sFontName);
   if (sFontName.IsEmpty()) {
     return FALSE;
   }
   FX_FLOAT fFontSize = FX_atof(syntax.GetWord());
   CPVT_Color crText = ParseColor(DA);
   FX_BOOL bUseFormRes = FALSE;
   CPDF_Dictionary* pFontDict = NULL;
   CPDF_Dictionary* pDRDict = pAnnotDict->GetDict("DR");
-  if (pDRDict == NULL) {
+  if (!pDRDict) {
     pDRDict = pFormDict->GetDict("DR");
     bUseFormRes = TRUE;
   }
   CPDF_Dictionary* pDRFontDict = NULL;
   if (pDRDict && (pDRFontDict = pDRDict->GetDict("Font"))) {
     pFontDict = pDRFontDict->GetDict(sFontName.Mid(1));
     if (!pFontDict && !bUseFormRes) {
       pDRDict = pFormDict->GetDict("DR");
       pDRFontDict = pDRDict->GetDict("Font");
       if (pDRFontDict) {
         pFontDict = pDRFontDict->GetDict(sFontName.Mid(1));
       }
     }
   }
   if (!pDRFontDict) {
     return FALSE;
   }
   if (!pFontDict) {
     pFontDict = CPDF_Dictionary::Create();
-    if (pFontDict == NULL) {
+    if (!pFontDict) {
       return FALSE;
     }
     pFontDict->SetAtName("Type", "Font");
     pFontDict->SetAtName("Subtype", "Type1");
     pFontDict->SetAtName("BaseFont", "Helvetica");
     pFontDict->SetAtName("Encoding", "WinAnsiEncoding");
     pDoc->AddIndirectObject(pFontDict);
     pDRFontDict->SetAtReference(sFontName.Mid(1), pDoc, pFontDict);
   }
   CPDF_Font* pDefFont = pDoc->LoadFont(pFontDict);
@@ skipping 85 matching lines @@
       rcBBox, fBorderWidth, crBorder, crLeftTop, crRightBottom, nBorderStyle,
       dsBorder);
   if (sBorderStream.GetLength() > 0) {
     sAppStream << "q\n" << sBorderStream << "Q\n";
   }
   CPDF_Rect rcBody =
       CPDF_Rect(rcBBox.left + fBorderWidth, rcBBox.bottom + fBorderWidth,
                 rcBBox.right - fBorderWidth, rcBBox.top - fBorderWidth);
   rcBody.Normalize();
   CPDF_Dictionary* pAPDict = pAnnotDict->GetDict("AP");
-  if (pAPDict == NULL) {
+  if (!pAPDict) {
     pAPDict = CPDF_Dictionary::Create();
-    if (pAPDict == NULL) {
+    if (!pAPDict) {

[Tom Sepez, 2015/12/14 18:27:00]

nit: can this fail? I though I fixed these.  hmmm.

[Lei Zhang, 2015/12/15 01:58:35]

I thought I fixed these too.

       return FALSE;
     }
     pAnnotDict->SetAt("AP", pAPDict);
   }
   CPDF_Stream* pNormalStream = pAPDict->GetStream("N");
   if (!pNormalStream) {
     pNormalStream = new CPDF_Stream(nullptr, 0, nullptr);
     int32_t objnum = pDoc->AddIndirectObject(pNormalStream);
     pAnnotDict->GetDict("AP")->SetAtReference("N", pDoc, objnum);
   }
   CPDF_Dictionary* pStreamDict = pNormalStream->GetDict();
   if (pStreamDict) {
     pStreamDict->SetAtMatrix("Matrix", matrix);
     pStreamDict->SetAtRect("BBox", rcBBox);
     CPDF_Dictionary* pStreamResList = pStreamDict->GetDict("Resources");
     if (pStreamResList) {
       CPDF_Dictionary* pStreamResFontList = pStreamResList->GetDict("Font");
       if (!pStreamResFontList) {
         pStreamResFontList = CPDF_Dictionary::Create();
-        if (pStreamResFontList == NULL) {
+        if (!pStreamResFontList) {
           return FALSE;
         }
         pStreamResList->SetAt("Font", pStreamResFontList);
       }
       if (!pStreamResFontList->KeyExist(sFontName)) {
         pStreamResFontList->SetAtReference(sFontName, pDoc, pFontDict);
       }
     } else {
       pStreamDict->SetAt("Resources", pFormDict->GetDict("DR")->Clone());
       pStreamResList = pStreamDict->GetDict("Resources");
@@ skipping 227 matching lines @@
                            sAppStream.GetSize(), FALSE, FALSE);
     pStreamDict = pNormalStream->GetDict();
     if (pStreamDict) {
       pStreamDict->SetAtMatrix("Matrix", matrix);
       pStreamDict->SetAtRect("BBox", rcBBox);
       CPDF_Dictionary* pStreamResList = pStreamDict->GetDict("Resources");
       if (pStreamResList) {
         CPDF_Dictionary* pStreamResFontList = pStreamResList->GetDict("Font");
         if (!pStreamResFontList) {
           pStreamResFontList = CPDF_Dictionary::Create();
-          if (pStreamResFontList == NULL) {
+          if (!pStreamResFontList) {
             return FALSE;
           }
           pStreamResList->SetAt("Font", pStreamResFontList);
         }
         if (!pStreamResFontList->KeyExist(sFontName)) {
           pStreamResFontList->SetAtReference(sFontName, pDoc, pFontDict);
         }
       } else {
         pStreamDict->SetAt("Resources", pFormDict->GetDict("DR")->Clone());
         pStreamResList = pStreamDict->GetDict("Resources");
@@ skipping 223 matching lines @@
                    << "\n";
       break;
     case CT_CMYK:
       sColorStream << color.fColor1 << " " << color.fColor2 << " "
                    << color.fColor3 << " " << color.fColor4 << " "
                    << (bFillOrStroke ? "k" : "K") << "\n";
       break;
   }
   return sColorStream.GetByteString();
 }