Merge to XFA: Get rid of most instance of 'foo == NULL'

core/src/fpdftext/fpdf_text.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/fpdfapi/fpdf_page.h"
 #include "core/include/fpdfapi/fpdf_pageobj.h"
 #include "core/include/fpdfapi/fpdf_resource.h"
 #include "core/include/fpdftext/fpdf_text.h"
@@ skipping 150 matching lines @@
                                         FX_FLOAT rightx,
                                         FX_FLOAT topy,
                                         FX_FLOAT bottomy,
                                         FX_FLOAT spacew,
                                         FX_FLOAT fontsize_v,
                                         CFX_ByteString& str,
                                         CPDF_Font* pFont) {
   if (str.GetLength() == 0) {
     return NULL;
   }
-  if (pBaseLine == NULL) {
+  if (!pBaseLine) {
     int i;
     for (i = 0; i < m_BaseLines.GetSize(); i++) {
       CTextBaseLine* pExistLine = m_BaseLines.GetAt(i);
       if (pExistLine->m_BaseLine == basey) {
         pBaseLine = pExistLine;
         break;
       }
       if (pExistLine->m_BaseLine < basey) {
         break;
       }
     }
-    if (pBaseLine == NULL) {
+    if (!pBaseLine) {
       pBaseLine = new CTextBaseLine;
       pBaseLine->m_BaseLine = basey;
       m_BaseLines.InsertAt(i, pBaseLine);
     }
   }
   CFX_WideString text;
   const FX_CHAR* pStr = str;
   int len = str.GetLength(), offset = 0;
   while (offset < len) {
     FX_DWORD ch = pFont->GetNextChar(pStr, len, offset);
@@ skipping 247 matching lines @@
   }
   return TRUE;
 }
 void CTextPage::FindColumns() {
   int i;
   for (i = 0; i < m_BaseLines.GetSize(); i++) {
     CTextBaseLine* pBaseLine = m_BaseLines.GetAt(i);
     for (int j = 0; j < pBaseLine->m_TextList.GetSize(); j++) {
       CTextBox* pTextBox = pBaseLine->m_TextList.GetAt(j);
       CTextColumn* pColumn = FindColumn(pTextBox->m_Right);
-      if (pColumn == NULL) {
+      if (pColumn) {
+        pColumn->m_AvgPos =
+            (pColumn->m_Count * pColumn->m_AvgPos + pTextBox->m_Right) /
+            (pColumn->m_Count + 1);
+        pColumn->m_Count++;
+      } else {
         pColumn = new CTextColumn;
         pColumn->m_Count = 1;
         pColumn->m_AvgPos = pTextBox->m_Right;
         pColumn->m_TextPos = -1;
         m_TextColumns.Add(pColumn);
-      } else {
-        pColumn->m_AvgPos =
-            (pColumn->m_Count * pColumn->m_AvgPos + pTextBox->m_Right) /
-            (pColumn->m_Count + 1);
-        pColumn->m_Count++;
       }
     }
   }
   int mincount = m_BaseLines.GetSize() / 4;
   for (i = 0; i < m_TextColumns.GetSize(); i++) {
     CTextColumn* pTextColumn = m_TextColumns.GetAt(i);
     if (pTextColumn->m_Count >= mincount) {
       continue;
     }
     delete pTextColumn;
@@ skipping 247 matching lines @@
   }
   page.Transform(matrix);
   page_bbox.Transform(&matrix);
 }
 void PDF_GetPageText_Unicode(CFX_WideStringArray& lines,
                              CPDF_Document* pDoc,
                              CPDF_Dictionary* pPage,
                              int iMinWidth,
                              FX_DWORD flags) {
   lines.RemoveAll();
-  if (pPage == NULL) {
+  if (!pPage) {
     return;
   }
   CPDF_Page page;
   page.Load(pDoc, pPage);
   CPDF_ParseOptions options;
   options.m_bTextOnly = TRUE;
   options.m_bSeparateForm = FALSE;
   page.ParseContent(&options);
   CFX_FloatRect page_bbox = page.GetPageBBox();
   if (flags & PDF2TXT_AUTO_ROTATE) {
@@ skipping 40 matching lines @@
                                FX_DWORD flags) {
   buffer.EstimateSize(0, 10240);
   CPDF_Page page;
   page.Load(pDoc, pPage);
   CPDF_ParseOptions options;
   options.m_bTextOnly = TRUE;
   options.m_bSeparateForm = FALSE;
   page.ParseContent(&options);
   GetTextStream_Unicode(buffer, &page, TRUE, NULL);
 }