FX_BOOL considered harmful, part 2.

fpdfsdk/src/fpdf_transformpage.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_transformpage.h"
 #include "../include/fsdk_define.h"
 
 DLLEXPORT void STDCALL FPDFPage_SetMediaBox(FPDF_PAGE page, float left, float bottom, float right, float top)
@@ skipping 24 matching lines @@
         pCropBoxArray->Add(new CPDF_Number(bottom));
         pCropBoxArray->Add(new CPDF_Number(FX_FLOAT(right)));
         pCropBoxArray->Add(new CPDF_Number(FX_FLOAT(top)));
         pPageDict->SetAt("CropBox", pCropBoxArray);
 }
 
 
 DLLEXPORT FPDF_BOOL STDCALL FPDFPage_GetMediaBox(FPDF_PAGE page, float* left, float* bottom, float* right, float* top)
 {
         if(!page)
-                return FALSE;
+                return false;
         CPDF_Page* pPage = (CPDF_Page*)page;
         CPDF_Dictionary* pPageDict = pPage->m_pFormDict;
         CPDF_Array* pArray = pPageDict->GetArray("MediaBox");
         if(pArray)
         {
                 *left = pArray->GetFloat(0);
                 *bottom = pArray->GetFloat(1);
                 *right = pArray->GetFloat(2);
                 *top = pArray->GetFloat(3);
-                return TRUE;
+                return true;
         }
-        return FALSE;
+        return false;
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FPDFPage_GetCropBox(FPDF_PAGE page, float* left, float* bottom, float* right, float* top)
 {
         if(!page)
-                return FALSE;
+                return false;
         CPDF_Page* pPage = (CPDF_Page*)page;
         CPDF_Dictionary* pPageDict = pPage->m_pFormDict;
         CPDF_Array* pArray = pPageDict->GetArray("CropBox");
         if(pArray)
         {
                 *left = pArray->GetFloat(0);
                 *bottom = pArray->GetFloat(1);
                 *right = pArray->GetFloat(2);
                 *top = pArray->GetFloat(3);
-                return TRUE;
+                return true;
         }
-        return FALSE;
+        return false;
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FPDFPage_TransFormWithClip(FPDF_PAGE page, FS_MATRIX* matrix, FS_RECTF* clipRect)
 {
         if(!page)
-                return FALSE;
+                return false;
 
         CFX_ByteTextBuf textBuf;
         textBuf<<"q ";
         CFX_FloatRect rect(clipRect->left, clipRect->bottom, clipRect->right, clipRect->top);
         rect.Normalize();
         CFX_ByteString bsClipping;
         bsClipping.Format("%f %f %f %f re W* n ", rect.left, rect.bottom, rect.Width(), rect.Height());
         textBuf<<bsClipping;
 
         CFX_ByteString bsMatix;
         bsMatix.Format("%f %f %f %f %f %f cm ", matrix->a, matrix->b,matrix->c,matrix->d,matrix->e,matrix->f);
         textBuf<<bsMatix;
 
 
         CPDF_Page* pPage = (CPDF_Page*)page;
         CPDF_Dictionary* pPageDic = pPage->m_pFormDict;
         CPDF_Object* pContentObj = pPageDic ? pPageDic->GetElement("Contents") : NULL;
         if(!pContentObj)
                 pContentObj = pPageDic ? pPageDic->GetArray("Contents") : NULL;
         if(!pContentObj)
-                return FALSE;
+                return false;
 
         CPDF_Dictionary* pDic = new CPDF_Dictionary;
         CPDF_Stream* pStream = new CPDF_Stream(NULL,0, pDic);
-        pStream->SetData(textBuf.GetBuffer(), textBuf.GetSize(), FALSE, FALSE);
+        pStream->SetData(textBuf.GetBuffer(), textBuf.GetSize(), false, false);
         CPDF_Document* pDoc = pPage->m_pDocument;
         if(!pDoc)
-                return FALSE;
+                return false;
         pDoc->AddIndirectObject(pStream);
 
         pDic = new CPDF_Dictionary;
         CPDF_Stream* pEndStream = new CPDF_Stream(NULL,0, pDic);
-        pEndStream->SetData((const uint8_t*)" Q", 2, FALSE, FALSE);
+        pEndStream->SetData((const uint8_t*)" Q", 2, false, false);
         pDoc->AddIndirectObject(pEndStream);
 
         CPDF_Array* pContentArray = NULL;
         if (pContentObj && pContentObj->GetType() == PDFOBJ_ARRAY)
         {
                 pContentArray = (CPDF_Array*)pContentObj;
                 CPDF_Reference* pRef = new CPDF_Reference(pDoc, pStream->GetObjNum());
                 pContentArray->InsertAt(0, pRef);
                 pContentArray->AddReference(pDoc,pEndStream);
 
@@ skipping 49 matching lines @@
                                         continue;
 
                                 CFX_AffineMatrix m = pDict->GetMatrix(FX_BSTRC("Matrix"));
                                 CFX_AffineMatrix t = *(CFX_AffineMatrix*)matrix;
                                 m.Concat(t);
                                 pDict->SetAtMatrix(FX_BSTRC("Matrix"), m);
                         }
                 }
         }
 
-        return TRUE;
+        return true;
 }
 
 DLLEXPORT void STDCALL FPDFPageObj_TransformClipPath(FPDF_PAGEOBJECT page_object,double a, double b, double c, double d, double e, double f)
 {
         CPDF_PageObject* pPageObj = (CPDF_PageObject*)page_object;
         if(pPageObj == NULL)
                 return;
         CFX_AffineMatrix matrix((FX_FLOAT)a,(FX_FLOAT)b,(FX_FLOAT)c,(FX_FLOAT)d,(FX_FLOAT)e,(FX_FLOAT)f);
 
         //Special treatment to shading object, because the ClipPath for shading object is already transformed.
         if(pPageObj->m_Type != PDFPAGE_SHADING)
                 pPageObj->TransformClipPath(matrix);
         pPageObj->TransformGeneralState(matrix);
 }
 
 
 DLLEXPORT FPDF_CLIPPATH STDCALL FPDF_CreateClipPath(float left, float bottom, float right, float top)
 {
         CPDF_ClipPath* pNewClipPath = new CPDF_ClipPath();
         pNewClipPath->GetModify();
         CPDF_Path Path;
         Path.GetModify();
         Path.AppendRect(left, bottom, right, top);
-        pNewClipPath->AppendPath(Path, FXFILL_ALTERNATE, FALSE);
+        pNewClipPath->AppendPath(Path, FXFILL_ALTERNATE, false);
         return pNewClipPath;
 }
 
 DLLEXPORT void STDCALL FPDF_DestroyClipPath(FPDF_CLIPPATH clipPath)
 {
     delete (CPDF_ClipPath*)clipPath;
 }
 
 void OutputPath(CFX_ByteTextBuf& buf, CPDF_Path path)
 {
@@ skipping 56 matching lines @@
                 } else {
                         OutputPath(strClip, path);
                         if (iClipType == FXFILL_WINDING)
                                 strClip << "W n\n";
                         else
                                 strClip << "W* n\n";
                 }
         }
         CPDF_Dictionary* pDic = new CPDF_Dictionary;
         CPDF_Stream* pStream = new CPDF_Stream(NULL,0, pDic);
-        pStream->SetData(strClip.GetBuffer(), strClip.GetSize(), FALSE, FALSE);
+        pStream->SetData(strClip.GetBuffer(), strClip.GetSize(), false, false);
         CPDF_Document* pDoc = pPage->m_pDocument;
         if(!pDoc)
                 return;
         pDoc->AddIndirectObject(pStream);
 
         CPDF_Array* pContentArray = NULL;
         if (pContentObj && pContentObj->GetType() == PDFOBJ_ARRAY)
         {
                 pContentArray = (CPDF_Array*)pContentObj;
                 CPDF_Reference* pRef = new CPDF_Reference(pDoc, pStream->GetObjNum());
@@ skipping 15 matching lines @@
                         {
                                 pContentArray = new CPDF_Array();
                                 pContentArray->AddReference(pDoc,pStream->GetObjNum());
                                 pContentArray->AddReference(pDoc,pDirectObj->GetObjNum());
                                 pPageDic->SetAtReference("Contents", pDoc, pDoc->AddIndirectObject(pContentArray));
                         }
                 }
         }
 }