FX_BOOL considered harmful, part 2.

fpdfsdk/src/fpdf_flatten.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 "../../public/fpdf_flatten.h"
 #include "../include/fsdk_define.h"
 
 typedef CFX_ArrayTemplate<CPDF_Dictionary*> CPDF_ObjectArray;
 typedef CFX_ArrayTemplate<CPDF_Rect> CPDF_RectArray;
 
 enum FPDF_TYPE { MAX, MIN };
 enum FPDF_VALUE { TOP, LEFT, RIGHT, BOTTOM };
 
-FX_BOOL IsValiableRect(CPDF_Rect rect, CPDF_Rect rcPage)
+bool IsValiableRect(CPDF_Rect rect, CPDF_Rect rcPage)
 {
         if ( rect.left - rect.right > 0.000001f ||
                  rect.bottom - rect.top > 0.000001f)
-                return FALSE;
+                return false;
 
         if (rect.left == 0.0f &&
                 rect.top == 0.0f &&
                 rect.right == 0.0f &&
                 rect.bottom == 0.0f)
-                return FALSE;
+                return false;
 
         if (!rcPage.IsEmpty())
         {
                 if (rect.left - rcPage.left < -10.000001f ||
                         rect.right - rcPage.right > 10.000001f ||
                         rect.top - rcPage.top > 10.000001f ||
                         rect.bottom - rcPage.bottom < -10.000001f)
-                        return FALSE;
+                        return false;
         }
 
-        return TRUE;
+        return true;
 }
 
 
-FX_BOOL GetContentsRect( CPDF_Document * pDoc, CPDF_Dictionary* pDict, CPDF_RectArray * pRectArray )
+bool GetContentsRect( CPDF_Document * pDoc, CPDF_Dictionary* pDict, CPDF_RectArray * pRectArray )
 {
         CPDF_Page* pPDFPage = new CPDF_Page;
-        pPDFPage->Load( pDoc, pDict, FALSE );
+        pPDFPage->Load( pDoc, pDict, false );
         pPDFPage->ParseContent();
 
         FX_POSITION pos = pPDFPage->GetFirstObjectPosition();
 
         while (pos)
         {
                 CPDF_PageObject* pPageObject = pPDFPage->GetNextObject(pos);
                 if (!pPageObject)continue;
 
                 CPDF_Rect rc;
                 rc.left = pPageObject->m_Left;
                 rc.right = pPageObject->m_Right;
                 rc.bottom = pPageObject->m_Bottom;
                 rc.top = pPageObject->m_Top;
 
                 if (IsValiableRect(rc, pDict->GetRect("MediaBox")))
                 {
                         pRectArray->Add(rc);
                 }
         }
 
         delete pPDFPage;
-        return TRUE;
+        return true;
 }
 
 
 void ParserStream( CPDF_Dictionary * pPageDic, CPDF_Dictionary* pStream, CPDF_RectArray * pRectArray, CPDF_ObjectArray * pObjectArray )
 {
         if (!pStream)return;
         CPDF_Rect rect;
         if (pStream->KeyExist("Rect"))
                 rect = pStream->GetRect("Rect");
         else if (pStream->KeyExist("BBox"))
@@ skipping 132 matching lines @@
         if (!pContentsObj)
         {
                 //Create a new contents dictionary
                 if (!key.IsEmpty())
                 {
                         CPDF_Stream* pNewContents = new CPDF_Stream(NULL, 0, new CPDF_Dictionary);
                         pPage->SetAtReference("Contents", pDocument, pDocument->AddIndirectObject(pNewContents));
 
                         CFX_ByteString sStream;
                         sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", key.c_str());
-                        pNewContents->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE, FALSE);
+                        pNewContents->SetData((const uint8_t*)sStream, sStream.GetLength(), false, false);
                 }
                 return;
         }
 
         int iType = pContentsObj->GetType();
         CPDF_Array* pContentsArray = NULL;
 
         switch(iType)
         {
         case PDFOBJ_STREAM:
                 {
                         pContentsArray = new CPDF_Array;
                         CPDF_Stream* pContents = (CPDF_Stream*)pContentsObj;
                         FX_DWORD dwObjNum = pDocument->AddIndirectObject(pContents);
                         CPDF_StreamAcc acc;
                         acc.LoadAllData(pContents);
                         CFX_ByteString sStream = "q\n";
                         CFX_ByteString sBody = CFX_ByteString((const FX_CHAR*)acc.GetData(), acc.GetSize());
                         sStream = sStream + sBody + "\nQ";
-                        pContents->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE, FALSE);
+                        pContents->SetData((const uint8_t*)sStream, sStream.GetLength(), false, false);
                         pContentsArray->AddReference(pDocument, dwObjNum);
                         break;
                 }
 
         case PDFOBJ_ARRAY:
                 {
                         pContentsArray = (CPDF_Array*)pContentsObj;
                         break;
                 }
         default:
                 break;
         }
 
         if (!pContentsArray)return;
 
         FX_DWORD dwObjNum = pDocument->AddIndirectObject(pContentsArray);
         pPage->SetAtReference("Contents", pDocument, dwObjNum);
 
         if (!key.IsEmpty())
         {
                 CPDF_Stream* pNewContents = new CPDF_Stream(NULL, 0, new CPDF_Dictionary);
                 dwObjNum = pDocument->AddIndirectObject(pNewContents);
                 pContentsArray->AddReference(pDocument, dwObjNum);
 
                 CFX_ByteString sStream;
                 sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", key.c_str());
-                pNewContents->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE, FALSE);
+                pNewContents->SetData((const uint8_t*)sStream, sStream.GetLength(), false, false);
         }
 }
 
 CFX_AffineMatrix GetMatrix(CPDF_Rect rcAnnot, CPDF_Rect rcStream, CFX_AffineMatrix matrix)
 {
         if(rcStream.IsEmpty())
                 return CFX_AffineMatrix();
 
         matrix.TransformRect(rcStream);
         rcStream.Normalize();
@@ skipping 253 matching lines @@
                         matrix.c = 0.0f;
                         matrix.d = 1.0f;
                         matrix.e = 0.0f;
                         matrix.f = 0.0f;
                 }
 
                 CFX_AffineMatrix m = GetMatrix(rcAnnot, rcStream, matrix);
                 sTemp.Format("q %f 0 0 %f %f %f cm /%s Do Q\n", m.a, m.d, m.e, m.f, sFormName.c_str());
                 sStream += sTemp;
 
-                pNewXObject->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE, FALSE);
+                pNewXObject->SetData((const uint8_t*)sStream, sStream.GetLength(), false, false);
         }
         pPageDict->RemoveAt( "Annots" );
 
         ObjectArray.RemoveAll();
         RectArray.RemoveAll();
 
         return FLATTEN_SUCCESS;
 }