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

core/src/fpdfdoc/doc_vt.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_doc.h"
 #include "core/include/fpdfdoc/fpdf_vt.h"
 #include "pdf_vt.h"
 
@@ skipping 66 matching lines @@
     m_WordArray.Add(pWord);
   } else {
     m_WordArray.InsertAt(nWordIndex, pWord);
   }
   return place;
 }
 CPVT_WordPlace CSection::AddLine(const CPVT_LineInfo& lineinfo) {
   return CPVT_WordPlace(SecPlace.nSecIndex, m_LineArray.Add(lineinfo), -1);
 }
 CPVT_FloatRect CSection::Rearrange() {
-  ASSERT(m_pVT != NULL);
   if (m_pVT->m_nCharArray > 0) {
     return CTypeset(this).CharArray();
   }
   return CTypeset(this).Typeset();
 }
 CPVT_Size CSection::GetSectionSize(FX_FLOAT fFontSize) {
   return CTypeset(this).GetEditSize(fFontSize);
 }
 CPVT_WordPlace CSection::GetBeginWordPlace() const {
   if (CLine* pLine = m_LineArray.GetAt(0)) {
@@ skipping 61 matching lines @@
       } else {
         place.nLineIndex = nMid;
         return;
       }
     } else {
       break;
     }
   }
 }
 CPVT_WordPlace CSection::SearchWordPlace(const CPDF_Point& point) const {
-  ASSERT(m_pVT != NULL);
+  ASSERT(m_pVT);
   CPVT_WordPlace place = GetBeginWordPlace();
   FX_BOOL bUp = TRUE;
   FX_BOOL bDown = TRUE;
   int32_t nLeft = 0;
   int32_t nRight = m_LineArray.GetSize() - 1;
   int32_t nMid = m_LineArray.GetSize() / 2;
   FX_FLOAT fTop = 0;
   FX_FLOAT fBottom = 0;
   while (nLeft <= nRight) {
     if (CLine* pLine = m_LineArray.GetAt(nMid)) {
@@ skipping 119 matching lines @@
 void CSection::ClearWord(const CPVT_WordPlace& place) {
   delete m_WordArray.GetAt(place.nWordIndex);
   m_WordArray.RemoveAt(place.nWordIndex);
 }
 CTypeset::CTypeset(CSection* pSection)
     : m_rcRet(0.0f, 0.0f, 0.0f, 0.0f),
       m_pVT(pSection->m_pVT),
       m_pSection(pSection) {}
 CTypeset::~CTypeset() {}
 CPVT_FloatRect CTypeset::CharArray() {
-  ASSERT(m_pSection != NULL);
-  ASSERT(m_pVT != NULL);
+  ASSERT(m_pSection);
   FX_FLOAT fLineAscent =
       m_pVT->GetFontAscent(m_pVT->GetDefaultFontIndex(), m_pVT->GetFontSize());
   FX_FLOAT fLineDescent =
       m_pVT->GetFontDescent(m_pVT->GetDefaultFontIndex(), m_pVT->GetFontSize());
   m_rcRet.Default();
   FX_FLOAT x = 0.0f, y = 0.0f;
   FX_FLOAT fNextWidth;
   int32_t nStart = 0;
   FX_FLOAT fNodeWidth = m_pVT->GetPlateWidth() /
                         (m_pVT->m_nCharArray <= 0 ? 1 : m_pVT->m_nCharArray);
@@ skipping 54 matching lines @@
     pLine->m_LineInfo.nEndWordIndex = m_pSection->m_WordArray.GetSize() - 1;
     pLine->m_LineInfo.fLineY = y;
     pLine->m_LineInfo.fLineWidth = x - pLine->m_LineInfo.fLineX;
     pLine->m_LineInfo.fLineAscent = fLineAscent;
     pLine->m_LineInfo.fLineDescent = fLineDescent;
     y += (-fLineDescent);
   }
   return m_rcRet = CPVT_FloatRect(0, 0, x, y);
 }
 CPVT_Size CTypeset::GetEditSize(FX_FLOAT fFontSize) {
-  ASSERT(m_pSection != NULL);
-  ASSERT(m_pVT != NULL);
+  ASSERT(m_pSection);
+  ASSERT(m_pVT);
   SplitLines(FALSE, fFontSize);
   return CPVT_Size(m_rcRet.Width(), m_rcRet.Height());
 }
 CPVT_FloatRect CTypeset::Typeset() {
-  ASSERT(m_pSection != NULL);
-  ASSERT(m_pVT != NULL);
+  ASSERT(m_pVT);
   m_pSection->m_LineArray.Empty();
   SplitLines(TRUE, 0.0f);
   m_pSection->m_LineArray.Clear();
   OutputLines();
   return m_rcRet;
 }
 static int special_chars[128] = {
     0x0000, 0x000C, 0x0008, 0x000C, 0x0008, 0x0000, 0x0020, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ skipping 161 matching lines @@
   }
   if (IsPrefixSymbol(curWord) || IsCJK(curWord)) {
     return TRUE;
   }
   if (IsCJK(prevWord)) {
     return TRUE;
   }
   return FALSE;
 }
 void CTypeset::SplitLines(FX_BOOL bTypeset, FX_FLOAT fFontSize) {
-  ASSERT(m_pVT != NULL);
-  ASSERT(m_pSection != NULL);
+  ASSERT(m_pVT);
+  ASSERT(m_pSection);
   int32_t nLineHead = 0;
   int32_t nLineTail = 0;
   FX_FLOAT fMaxX = 0.0f, fMaxY = 0.0f;
   FX_FLOAT fLineWidth = 0.0f, fBackupLineWidth = 0.0f;
   FX_FLOAT fLineAscent = 0.0f, fBackupLineAscent = 0.0f;
   FX_FLOAT fLineDescent = 0.0f, fBackupLineDescent = 0.0f;
   int32_t nWordStartPos = 0;
   FX_BOOL bFullWord = FALSE;
   int32_t nLineFullWordIndex = 0;
   int32_t nCharIndex = 0;
@@ skipping 26 matching lines @@
               FPDF_MIN(fLineDescent, m_pVT->GetWordDescent(*pWord, fFontSize));
           fWordWidth = m_pVT->GetWordWidth(
               pWord->nFontIndex, pWord->Word, m_pVT->m_wSubWord,
               m_pVT->m_fCharSpace, m_pVT->m_nHorzScale, fFontSize,
               pWord->fWordTail, 0);
         }
         if (!bOpened) {
           if (IsOpenStylePunctuation(pWord->Word)) {
             bOpened = TRUE;
             bFullWord = TRUE;
-          } else if (pOldWord != NULL) {
+          } else if (pOldWord) {
             if (NeedDivision(pOldWord->Word, pWord->Word)) {
               bFullWord = TRUE;
             }
           }
         } else {
           if (!IsSpace(pWord->Word) && !IsOpenStylePunctuation(pWord->Word)) {
             bOpened = FALSE;
           }
         }
         if (bFullWord) {
@@ skipping 78 matching lines @@
       line.fLineAscent = fLineAscent;
       line.fLineDescent = fLineDescent;
       m_pSection->AddLine(line);
     }
     fMaxY += (m_pVT->GetLineLeading(m_pSection->m_SecInfo) + fLineAscent +
               (-fLineDescent));
   }
   m_rcRet = CPVT_FloatRect(0, 0, fMaxX, fMaxY);
 }
 void CTypeset::OutputLines() {
-  ASSERT(m_pVT != NULL);
-  ASSERT(m_pSection != NULL);
+  ASSERT(m_pVT);
+  ASSERT(m_pSection);
   FX_FLOAT fMinX = 0.0f, fMinY = 0.0f, fMaxX = 0.0f, fMaxY = 0.0f;
   FX_FLOAT fPosX = 0.0f, fPosY = 0.0f;
   FX_FLOAT fLineIndent = m_pVT->GetLineIndent(m_pSection->m_SecInfo);
   FX_FLOAT fTypesetWidth = FPDF_MAX(m_pVT->GetPlateWidth() - fLineIndent, 0.0f);
   switch (m_pVT->GetAlignment(m_pSection->m_SecInfo)) {
     default:
     case 0:
       fMinX = 0.0f;
       break;
     case 1:
@@ skipping 937 matching lines @@
 IPDF_VariableText_Provider* CPDF_VariableText::SetProvider(
     IPDF_VariableText_Provider* pProvider) {
   IPDF_VariableText_Provider* pOld = m_pVTProvider;
   m_pVTProvider = pProvider;
   return pOld;
 }
 CPDF_VariableText_Iterator::CPDF_VariableText_Iterator(CPDF_VariableText* pVT)
     : m_CurPos(-1, -1, -1), m_pVT(pVT) {}
 CPDF_VariableText_Iterator::~CPDF_VariableText_Iterator() {}
 void CPDF_VariableText_Iterator::SetAt(int32_t nWordIndex) {
-  ASSERT(m_pVT != NULL);
   m_CurPos = m_pVT->WordIndexToWordPlace(nWordIndex);
 }
 void CPDF_VariableText_Iterator::SetAt(const CPVT_WordPlace& place) {
-  ASSERT(m_pVT != NULL);
+  ASSERT(m_pVT);
   m_CurPos = place;
 }
 FX_BOOL CPDF_VariableText_Iterator::NextWord() {
   if (m_CurPos == m_pVT->GetEndWordPlace()) {
     return FALSE;
   }
   m_CurPos = m_pVT->GetNextWordPlace(m_CurPos);
   return TRUE;
 }
 FX_BOOL CPDF_VariableText_Iterator::PrevWord() {
@@ skipping 36 matching lines @@
   return FALSE;
 }
 FX_BOOL CPDF_VariableText_Iterator::NextSection() {
   if (m_CurPos.nSecIndex < m_pVT->m_SectionArray.GetSize() - 1) {
     m_CurPos = CPVT_WordPlace(m_CurPos.nSecIndex + 1, 0, -1);
     return TRUE;
   }
   return FALSE;
 }
 FX_BOOL CPDF_VariableText_Iterator::PrevSection() {
-  ASSERT(m_pVT != NULL);
+  ASSERT(m_pVT);
   if (m_CurPos.nSecIndex > 0) {
     m_CurPos = CPVT_WordPlace(m_CurPos.nSecIndex - 1, 0, -1);
     return TRUE;
   }
   return FALSE;
 }
 FX_BOOL CPDF_VariableText_Iterator::GetWord(CPVT_Word& word) const {
-  ASSERT(m_pVT != NULL);
   word.WordPlace = m_CurPos;
   if (CSection* pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
     if (pSection->m_LineArray.GetAt(m_CurPos.nLineIndex)) {
       if (CPVT_WordInfo* pWord =
               pSection->m_WordArray.GetAt(m_CurPos.nWordIndex)) {
         word.Word = pWord->Word;
         word.nCharset = pWord->nCharset;
         word.fWidth = m_pVT->GetWordWidth(*pWord);
         word.ptWord = m_pVT->InToOut(
             CPDF_Point(pWord->fWordX + pSection->m_SecInfo.rcSection.left,
                        pWord->fWordY + pSection->m_SecInfo.rcSection.top));
         word.fAscent = m_pVT->GetWordAscent(*pWord);
         word.fDescent = m_pVT->GetWordDescent(*pWord);
         if (pWord->pWordProps) {
           word.WordProps = *pWord->pWordProps;
         }
         word.nFontIndex = m_pVT->GetWordFontIndex(*pWord);
         word.fFontSize = m_pVT->GetWordFontSize(*pWord);
         return TRUE;
       }
     }
   }
   return FALSE;
 }
 FX_BOOL CPDF_VariableText_Iterator::SetWord(const CPVT_Word& word) {
-  ASSERT(m_pVT != NULL);
   if (CSection* pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
     if (CPVT_WordInfo* pWord =
             pSection->m_WordArray.GetAt(m_CurPos.nWordIndex)) {
       if (pWord->pWordProps) {
         *pWord->pWordProps = word.WordProps;
       }
       return TRUE;
     }
   }
   return FALSE;
 }
 FX_BOOL CPDF_VariableText_Iterator::GetLine(CPVT_Line& line) const {
-  ASSERT(m_pVT != NULL);
+  ASSERT(m_pVT);
   line.lineplace = CPVT_WordPlace(m_CurPos.nSecIndex, m_CurPos.nLineIndex, -1);
   if (CSection* pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
     if (CLine* pLine = pSection->m_LineArray.GetAt(m_CurPos.nLineIndex)) {
       line.ptLine = m_pVT->InToOut(CPDF_Point(
           pLine->m_LineInfo.fLineX + pSection->m_SecInfo.rcSection.left,
           pLine->m_LineInfo.fLineY + pSection->m_SecInfo.rcSection.top));
       line.fLineWidth = pLine->m_LineInfo.fLineWidth;
       line.fLineAscent = pLine->m_LineInfo.fLineAscent;
       line.fLineDescent = pLine->m_LineInfo.fLineDescent;
       line.lineEnd = pLine->GetEndWordPlace();
       return TRUE;
     }
   }
   return FALSE;
 }
 FX_BOOL CPDF_VariableText_Iterator::GetSection(CPVT_Section& section) const {
-  ASSERT(m_pVT != NULL);
   section.secplace = CPVT_WordPlace(m_CurPos.nSecIndex, 0, -1);
   if (CSection* pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
     section.rcSection = m_pVT->InToOut(pSection->m_SecInfo.rcSection);
     if (pSection->m_SecInfo.pSecProps) {
       section.SecProps = *pSection->m_SecInfo.pSecProps;
     }
     if (pSection->m_SecInfo.pWordProps) {
       section.WordProps = *pSection->m_SecInfo.pWordProps;
     }
     return TRUE;
   }
   return FALSE;
 }
 FX_BOOL CPDF_VariableText_Iterator::SetSection(const CPVT_Section& section) {
-  ASSERT(m_pVT != NULL);
   if (CSection* pSection = m_pVT->m_SectionArray.GetAt(m_CurPos.nSecIndex)) {
     if (pSection->m_SecInfo.pSecProps) {
       *pSection->m_SecInfo.pSecProps = section.SecProps;
     }
     if (pSection->m_SecInfo.pWordProps) {
       *pSection->m_SecInfo.pWordProps = section.WordProps;
     }
     return TRUE;
   }
   return FALSE;
 }