FX_BOOL considered harmful.

core/src/fpdfdoc/doc_tagged.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_parser.h"
 #include "../../include/fpdfapi/fpdf_page.h"
 #include "../../include/fpdfdoc/fpdf_tagged.h"
 #include "tagged_int.h"
 const int nMaxRecursion = 32;
-static FX_BOOL IsTagged(const CPDF_Document* pDoc)
+static bool IsTagged(const CPDF_Document* pDoc)
 {
     CPDF_Dictionary* pCatalog = pDoc->GetRoot();
     CPDF_Dictionary* pMarkInfo = pCatalog->GetDict(FX_BSTRC("MarkInfo"));
     return pMarkInfo != NULL && pMarkInfo->GetInteger(FX_BSTRC("Marked"));
 }
 CPDF_StructTree* CPDF_StructTree::LoadPage(const CPDF_Document* pDoc, const CPDF_Dictionary* pPageDict)
 {
     if (!IsTagged(pDoc)) {
         return NULL;
     }
@@ skipping 108 matching lines @@
     pElement = new CPDF_StructElementImpl(this, NULL, pDict);
     map.SetAt(pDict, pElement);
     CPDF_Dictionary* pParent = pDict->GetDict(FX_BSTRC("P"));
     if (pParent == NULL || pParent->GetString(FX_BSTRC("Type")) == FX_BSTRC("StructTreeRoot")) {
         if (!AddTopLevelNode(pDict, pElement)) {
             pElement->Release();
             map.RemoveKey(pDict);
         }
     } else {
         CPDF_StructElementImpl* pParentElement = AddPageNode(pParent, map, nLevel + 1);
-        FX_BOOL bSave = FALSE;
+        bool bSave = false;
         for (int i = 0; i < pParentElement->m_Kids.GetSize(); i ++) {
             if (pParentElement->m_Kids[i].m_Type != CPDF_StructKid::Element) {
                 continue;
             }
             if (pParentElement->m_Kids[i].m_Element.m_pDict != pDict) {
                 continue;
             }
             pParentElement->m_Kids[i].m_Element.m_pElement = pElement->Retain();
-            bSave = TRUE;
+            bSave = true;
         }
         if (!bSave) {
             pElement->Release();
             map.RemoveKey(pDict);
         }
     }
     return pElement;
 }
-FX_BOOL CPDF_StructTreeImpl::AddTopLevelNode(CPDF_Dictionary* pDict, CPDF_StructElementImpl* pElement)
+bool CPDF_StructTreeImpl::AddTopLevelNode(CPDF_Dictionary* pDict, CPDF_StructElementImpl* pElement)
 {
     CPDF_Object *pObj = m_pTreeRoot->GetElementValue(FX_BSTRC("K"));
     if (!pObj) {
-        return FALSE;
+        return false;
     }
     if (pObj->GetType() == PDFOBJ_DICTIONARY) {
         if (pObj->GetObjNum() == pDict->GetObjNum()) {
             if (m_Kids[0]) {
                 m_Kids[0]->Release();
             }
             m_Kids[0] = pElement->Retain();
         } else {
-            return FALSE;
+            return false;
         }
     }
     if (pObj->GetType() == PDFOBJ_ARRAY) {
         CPDF_Array* pTopKids = (CPDF_Array*)pObj;
         FX_DWORD i;
-        FX_BOOL bSave = FALSE;
+        bool bSave = false;
         for (i = 0; i < pTopKids->GetCount(); i ++) {
             CPDF_Object* pKidRef = pTopKids->GetElement(i);
             if (pKidRef == NULL || pKidRef->GetType() != PDFOBJ_REFERENCE) {
                 continue;
             }
             if (((CPDF_Reference*) pKidRef)->GetRefObjNum() != pDict->GetObjNum()) {
                 continue;
             }
             if (m_Kids[i]) {
                 m_Kids[i]->Release();
             }
             m_Kids[i] = pElement->Retain();
-            bSave = TRUE;
+            bSave = true;
         }
         if (!bSave) {
-            return FALSE;
+            return false;
         }
     }
-    return TRUE;
+    return true;
 }
 CPDF_StructElementImpl::CPDF_StructElementImpl(CPDF_StructTreeImpl* pTree, CPDF_StructElementImpl* pParent, CPDF_Dictionary* pDict)
     : m_RefCount(0)
 {
     m_pTree = pTree;
     m_pDict = pDict;
     m_Type = pDict->GetString(FX_BSTRC("S"));
     if (pTree->m_pRoleMap) {
         CFX_ByteString mapped = pTree->m_pRoleMap->GetString(m_Type);
         if (!mapped.IsEmpty()) {
@@ skipping 125 matching lines @@
             if (pDict) {
                 return pDict;
             }
         }
     }
     if (pDict && pDict->GetString(FX_BSTRC("O")) == owner) {
         return pDict;
     }
     return NULL;
 }
-CPDF_Object* CPDF_StructElementImpl::GetAttr(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_BOOL bInheritable, FX_FLOAT fLevel)
+CPDF_Object* CPDF_StructElementImpl::GetAttr(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, bool bInheritable, FX_FLOAT fLevel)
 {
     if (fLevel > nMaxRecursion) {
         return NULL;
     }
     if (bInheritable) {
-        CPDF_Object* pAttr = GetAttr(owner, name, FALSE);
+        CPDF_Object* pAttr = GetAttr(owner, name, false);
         if (pAttr) {
             return pAttr;
         }
         if (m_pParent == NULL) {
             return NULL;
         }
-        return m_pParent->GetAttr(owner, name, TRUE, fLevel + 1);
+        return m_pParent->GetAttr(owner, name, true, fLevel + 1);
     }
     CPDF_Object* pA = m_pDict->GetElementValue(FX_BSTRC("A"));
     if (pA) {
         CPDF_Dictionary* pAttrDict = FindAttrDict(pA, owner);
         if (pAttrDict) {
             CPDF_Object* pAttr = pAttrDict->GetElementValue(name);
             if (pAttr) {
                 return pAttr;
             }
         }
@@ skipping 17 matching lines @@
         }
         return NULL;
     }
     CFX_ByteString class_name = pC->GetString();
     CPDF_Dictionary* pClassDict = pClassMap->GetDict(class_name);
     if (pClassDict && pClassDict->GetString(FX_BSTRC("O")) == owner) {
         return pClassDict->GetElementValue(name);
     }
     return NULL;
 }
-CPDF_Object* CPDF_StructElementImpl::GetAttr(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_BOOL bInheritable, int subindex)
+CPDF_Object* CPDF_StructElementImpl::GetAttr(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, bool bInheritable, int subindex)
 {
     CPDF_Object* pAttr = GetAttr(owner, name, bInheritable);
     if (pAttr == NULL || subindex == -1 || pAttr->GetType() != PDFOBJ_ARRAY) {
         return pAttr;
     }
     CPDF_Array* pArray = (CPDF_Array*)pAttr;
     if (subindex >= (int)pArray->GetCount()) {
         return pAttr;
     }
     return pArray->GetElementValue(subindex);
 }
-CFX_ByteString CPDF_StructElementImpl::GetName(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, const CFX_ByteStringC& default_value, FX_BOOL bInheritable, int subindex)
+CFX_ByteString CPDF_StructElementImpl::GetName(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, const CFX_ByteStringC& default_value, bool bInheritable, int subindex)
 {
     CPDF_Object* pAttr = GetAttr(owner, name, bInheritable, subindex);
     if (pAttr == NULL || pAttr->GetType() != PDFOBJ_NAME) {
         return default_value;
     }
     return pAttr->GetString();
 }
-FX_ARGB CPDF_StructElementImpl::GetColor(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_ARGB default_value, FX_BOOL bInheritable, int subindex)
+FX_ARGB CPDF_StructElementImpl::GetColor(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_ARGB default_value, bool bInheritable, int subindex)
 {
     CPDF_Object* pAttr = GetAttr(owner, name, bInheritable, subindex);
     if (pAttr == NULL || pAttr->GetType() != PDFOBJ_ARRAY) {
         return default_value;
     }
     CPDF_Array* pArray = (CPDF_Array*)pAttr;
     return 0xff000000 | ((int)(pArray->GetNumber(0) * 255) << 16) | ((int)(pArray->GetNumber(1) * 255) << 8) | (int)(pArray->GetNumber(2) * 255);
 }
-FX_FLOAT CPDF_StructElementImpl::GetNumber(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_FLOAT default_value, FX_BOOL bInheritable, int subindex)
+FX_FLOAT CPDF_StructElementImpl::GetNumber(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_FLOAT default_value, bool bInheritable, int subindex)
 {
     CPDF_Object* pAttr = GetAttr(owner, name, bInheritable, subindex);
     if (pAttr == NULL || pAttr->GetType() != PDFOBJ_NUMBER) {
         return default_value;
     }
     return pAttr->GetNumber();
 }
-int     CPDF_StructElementImpl::GetInteger(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, int default_value, FX_BOOL bInheritable, int subindex)
+int     CPDF_StructElementImpl::GetInteger(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, int default_value, bool bInheritable, int subindex)
 {
     CPDF_Object* pAttr = GetAttr(owner, name, bInheritable, subindex);
     if (pAttr == NULL || pAttr->GetType() != PDFOBJ_NUMBER) {
         return default_value;
     }
     return pAttr->GetInteger();
 }