FX Bool considered harmful, part 3

core/src/fpdftext/fpdf_text_search.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 "../../include/fpdfapi/fpdf_pageobj.h"
 #include "../../include/fpdfapi/fpdf_page.h"
 class CPDF_TextStream
 {
 public:
-    CPDF_TextStream(CFX_WideTextBuf& buffer, FX_BOOL bUseLF, CFX_PtrArray* pObjArray);
+    CPDF_TextStream(CFX_WideTextBuf& buffer, bool bUseLF, CFX_PtrArray* pObjArray);
     ~CPDF_TextStream() {}
-    FX_BOOL ProcessObject(const CPDF_TextObject* pObj, FX_BOOL bFirstLine);
+    bool ProcessObject(const CPDF_TextObject* pObj, bool bFirstLine);
     CFX_WideTextBuf&    m_Buffer;
-    FX_BOOL                             m_bUseLF;
+    bool                                m_bUseLF;
     CFX_PtrArray*               m_pObjArray;
     const CPDF_TextObject*      m_pLastObj;
 };
-CPDF_TextStream::CPDF_TextStream(CFX_WideTextBuf& buffer, FX_BOOL bUseLF, CFX_PtrArray* pObjArray) : m_Buffer(buffer)
+CPDF_TextStream::CPDF_TextStream(CFX_WideTextBuf& buffer, bool bUseLF, CFX_PtrArray* pObjArray) : m_Buffer(buffer)
 {
     m_pLastObj = NULL;
     m_bUseLF = bUseLF;
     m_pObjArray = pObjArray;
 }
-FX_BOOL FPDFText_IsSameTextObject(const CPDF_TextObject* pTextObj1, const CPDF_TextObject* pTextObj2)
+bool FPDFText_IsSameTextObject(const CPDF_TextObject* pTextObj1, const CPDF_TextObject* pTextObj2)
 {
     if (!pTextObj1 || !pTextObj2) {
-        return FALSE;
+        return false;
     }
     CFX_FloatRect rcPreObj(pTextObj2->m_Left, pTextObj2->m_Bottom, pTextObj2->m_Right, pTextObj2->m_Top);
     CFX_FloatRect rcCurObj(pTextObj1->m_Left, pTextObj1->m_Bottom, pTextObj1->m_Right, pTextObj1->m_Top);
     if (rcPreObj.IsEmpty() && rcCurObj.IsEmpty()) {
-        return TRUE;
+        return true;
     }
     if (!rcPreObj.IsEmpty() || !rcCurObj.IsEmpty()) {
         rcPreObj.Intersect(rcCurObj);
         if (rcPreObj.IsEmpty()) {
-            return FALSE;
+            return false;
         }
         if (FXSYS_fabs(rcPreObj.Width() - rcCurObj.Width()) > rcCurObj.Width() / 2) {
-            return FALSE;
+            return false;
         }
         if (pTextObj2->GetFontSize() != pTextObj1->GetFontSize()) {
-            return FALSE;
+            return false;
         }
     }
     int nPreCount = pTextObj2->CountItems();
     int nCurCount = pTextObj1->CountItems();
     if (nPreCount != nCurCount) {
-        return FALSE;
+        return false;
     }
     for (int i = 0; i < nPreCount; i++) {
         CPDF_TextObjectItem itemPer, itemCur;
         pTextObj2->GetItemInfo(i, &itemPer);
         pTextObj1->GetItemInfo(i, &itemCur);
         if (itemCur.m_CharCode != itemPer.m_CharCode) {
-            return FALSE;
+            return false;
         }
     }
-    return TRUE;
+    return true;
 }
 int GetCharWidth(FX_DWORD charCode, CPDF_Font* pFont)
 {
     if(charCode == -1) {
         return 0;
     }
     int w = pFont->GetCharWidthF(charCode);
     if(w == 0) {
         CFX_ByteString str;
         pFont->AppendChar(str, charCode);
@@ skipping 54 matching lines @@
             }
             if((x - last_pos - last_width) > this_width || (x - last_pos - this_width) > last_width ) {
                 return 1;
             }
         }
     if(last_pos + last_width > x + this_width && curChar == L' ') {
         return 3;
     }
     return 0;
 }
-FX_BOOL CPDF_TextStream::ProcessObject(const CPDF_TextObject* pObj, FX_BOOL bFirstLine)
+bool CPDF_TextStream::ProcessObject(const CPDF_TextObject* pObj, bool bFirstLine)
 {
     CPDF_Font* pFont = pObj->GetFont();
     CFX_AffineMatrix matrix;
     pObj->GetTextMatrix(&matrix);
     int item_index = 0;
     if (m_pLastObj) {
         int result = FPDFText_ProcessInterObj(m_pLastObj, pObj);
         if (result == 2) {
             int len = m_Buffer.GetLength();
             if (len && m_bUseLF && m_Buffer.GetBuffer()[len - 1] == L'-') {
                 m_Buffer.Delete(len - 1, 1);
                 if (m_pObjArray) {
                     m_pObjArray->RemoveAt((len - 1) * 2, 2);
                 }
             } else {
                 if (bFirstLine) {
-                    return TRUE;
+                    return true;
                 }
                 if (m_bUseLF) {
                     m_Buffer.AppendChar(L'\r');
                     m_Buffer.AppendChar(L'\n');
                     if (m_pObjArray) {
                         for (int i = 0; i < 4; i ++) {
                             m_pObjArray->Add(NULL);
                         }
                     }
                 } else {
                     m_Buffer.AppendChar(' ');
                     if (m_pObjArray) {
                         m_pObjArray->Add(NULL);
                         m_pObjArray->Add(NULL);
                     }
                 }
             }
         } else if (result == 1) {
             m_Buffer.AppendChar(L' ');
             if (m_pObjArray) {
                 m_pObjArray->Add(NULL);
                 m_pObjArray->Add(NULL);
             }
         } else if (result == -1) {
             m_pLastObj = pObj;
-            return FALSE;
+            return false;
         } else if (result == 3) {
             item_index = 1;
         }
     }
     m_pLastObj = pObj;
     int nItems = pObj->CountItems();
     FX_FLOAT Ignorekerning = 0;
     for(int i = 1; i < nItems - 1; i += 2) {
         CPDF_TextObjectItem item;
         pObj->GetItemInfo(i, &item);
@@ skipping 80 matching lines @@
         } else {
             m_Buffer << unicode_str;
             if (m_pObjArray) {
                 for (int i = 0; i < unicode_str.GetLength(); i ++) {
                     m_pObjArray->Add((void*)pObj);
                     m_pObjArray->Add((void*)(intptr_t)item_index);
                 }
             }
         }
     }
-    return FALSE;
+    return false;
 }
-void _PDF_GetTextStream_Unicode(CFX_WideTextBuf& buffer, CPDF_PageObjects* pPage, FX_BOOL bUseLF,
+void _PDF_GetTextStream_Unicode(CFX_WideTextBuf& buffer, CPDF_PageObjects* pPage, bool bUseLF,
                                 CFX_PtrArray* pObjArray)
 {
     CPDF_TextStream textstream(buffer, bUseLF, pObjArray);
     FX_POSITION pos = pPage->GetFirstObjectPosition();
     while (pos) {
         CPDF_PageObject* pObject = pPage->GetNextObject(pos);
         if (pObject == NULL) {
             continue;
         }
         if (pObject->m_Type != PDFPAGE_TEXT) {
             continue;
         }
-        textstream.ProcessObject((CPDF_TextObject*)pObject, FALSE);
+        textstream.ProcessObject((CPDF_TextObject*)pObject, false);
     }
 }
 CFX_WideString PDF_GetFirstTextLine_Unicode(CPDF_Document* pDoc, CPDF_Dictionary* pPage)
 {
     CFX_WideTextBuf buffer;
     buffer.EstimateSize(0, 1024);
     CPDF_Page page;
     page.Load(pDoc, pPage);
     CPDF_ParseOptions options;
-    options.m_bTextOnly = TRUE;
-    options.m_bSeparateForm = FALSE;
+    options.m_bTextOnly = true;
+    options.m_bSeparateForm = false;
     page.ParseContent(&options);
-    CPDF_TextStream textstream(buffer, FALSE, NULL);
+    CPDF_TextStream textstream(buffer, false, NULL);
     FX_POSITION pos = page.GetFirstObjectPosition();
     while (pos) {
         CPDF_PageObject* pObject = page.GetNextObject(pos);
         if (pObject->m_Type != PDFPAGE_TEXT) {
             continue;
         }
-        if (textstream.ProcessObject((CPDF_TextObject*)pObject, TRUE)) {
+        if (textstream.ProcessObject((CPDF_TextObject*)pObject, true)) {
             break;
         }
     }
     return buffer.GetWideString();
 }