Revert "FX_BOOL considered harmful, part 2."

core/src/fpdfapi/fpdf_page/fpdf_page.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_page.h"
 #include "../../../include/fpdfapi/fpdf_module.h"
 #include "pageint.h"
 CPDF_PageObject* CPDF_PageObject::Create(int type)
@@ skipping 26 matching lines @@
     if (m_Type != pSrc->m_Type) {
         return;
     }
     CopyData(pSrc);
     CopyStates(*pSrc);
     m_Left = pSrc->m_Left;
     m_Right = pSrc->m_Right;
     m_Top = pSrc->m_Top;
     m_Bottom = pSrc->m_Bottom;
 }
-void CPDF_PageObject::AppendClipPath(CPDF_Path path, int type, bool bAutoMerge)
+void CPDF_PageObject::AppendClipPath(CPDF_Path path, int type, FX_BOOL bAutoMerge)
 {
     m_ClipPath.AppendPath(path, type, bAutoMerge);
 }
 void CPDF_PageObject::CopyClipPath(CPDF_PageObject* pObj)
 {
     m_ClipPath = pObj->m_ClipPath;
 }
 void CPDF_PageObject::RemoveClipPath()
 {
     m_ClipPath.SetNull();
@@ skipping 288 matching lines @@
     } else {
         m_pCharCodes = (FX_DWORD*)(uintptr_t)pCharCodes[0];
     }
     RecalcPositionData();
 }
 
 FX_FLOAT CPDF_TextObject::GetCharWidth(FX_DWORD charcode) const
 {
     FX_FLOAT fontsize = m_TextState.GetFontSize() / 1000;
     CPDF_Font* pFont = m_TextState.GetFont();
-    bool bVertWriting = false;
+    FX_BOOL bVertWriting = FALSE;
     CPDF_CIDFont* pCIDFont = pFont->GetCIDFont();
     if (pCIDFont) {
         bVertWriting = pCIDFont->IsVertWriting();
     }
     if (!bVertWriting)
         return pFont->GetCharWidthF(charcode, 0) * fontsize;
 
     FX_WORD CID = pCIDFont->CIDFromCharCode(charcode);
     return pCIDFont->GetVertWidth(CID) * fontsize;
 }
 
 FX_FLOAT CPDF_TextObject::GetSpaceCharWidth() const
 {
     CPDF_Font* pFont = m_TextState.GetFont();
     FX_DWORD charCode = m_TextState.GetFont()->CharCodeFromUnicode(32);
     if (charCode != (FX_DWORD) - 1) {
         return GetCharWidth(charCode);
     }
     FX_FLOAT fontSize = m_TextState.GetFontSize() / 4000.0f;
-    bool bVertWriting = false;
+    FX_BOOL bVertWriting = FALSE;
     CPDF_CIDFont* pCIDFont = pFont->GetCIDFont();
     if (pCIDFont) {
         bVertWriting = pCIDFont->IsVertWriting();
     }
     FX_RECT fontRect;
     pFont->GetFontBBox(fontRect);
     fontSize *= bVertWriting ?
         (FX_FLOAT)fontRect.Height() : (FX_FLOAT)fontRect.Width();
     return fontSize;
 }
 
 void CPDF_TextObject::GetCharRect(int index, CFX_FloatRect& rect) const
 {
     CPDF_Font* pFont = m_TextState.GetFont();
-    bool bVertWriting = false;
+    FX_BOOL bVertWriting = FALSE;
     CPDF_CIDFont* pCIDFont = pFont->GetCIDFont();
     if (pCIDFont) {
         bVertWriting = pCIDFont->IsVertWriting();
     }
     FX_FLOAT fontsize = m_TextState.GetFontSize() / 1000;
     int count = 0;
     for (int i = 0; i < m_nChars; ++i) {
         FX_DWORD charcode = m_nChars == 1 ?
             (FX_DWORD)(uintptr_t)m_pCharCodes : m_pCharCodes[i];
         if (charcode == (FX_DWORD) - 1) {
@@ skipping 32 matching lines @@
                                        FX_FLOAT* pTextAdvanceY,
                                        FX_FLOAT horz_scale,
                                        int level)
 {
     FX_FLOAT curpos = 0;
     FX_FLOAT min_x = 10000 * 1.0f;
     FX_FLOAT max_x = -10000 * 1.0f;
     FX_FLOAT min_y = 10000 * 1.0f;
     FX_FLOAT max_y = -10000 * 1.0f;
     CPDF_Font* pFont = m_TextState.GetFont();
-    bool bVertWriting = false;
+    FX_BOOL bVertWriting = FALSE;
     CPDF_CIDFont* pCIDFont = pFont->GetCIDFont();
     if (pCIDFont) {
         bVertWriting = pCIDFont->IsVertWriting();
     }
     FX_FLOAT fontsize = m_TextState.GetFontSize();
     for (int i = 0; i < m_nChars; ++i) {
         FX_DWORD charcode = m_nChars == 1 ?
             (FX_DWORD)(uintptr_t)m_pCharCodes : m_pCharCodes[i];
         if (charcode == (FX_DWORD) - 1) {
             curpos -= FXSYS_Mul(m_pCharPos[i - 1], fontsize) / 1000;
@@ skipping 108 matching lines @@
         m_Left -= half_width;
         m_Right += half_width;
         m_Top += half_width;
         m_Bottom -= half_width;
     }
 }
 
 void CPDF_TextObject::CalcCharPos(FX_FLOAT* pPosArray) const
 {
     CPDF_Font* pFont = m_TextState.GetFont();
-    bool bVertWriting = false;
+    FX_BOOL bVertWriting = FALSE;
     CPDF_CIDFont* pCIDFont = pFont->GetCIDFont();
     if (pCIDFont) {
         bVertWriting = pCIDFont->IsVertWriting();
     }
     FX_FLOAT fontsize = m_TextState.GetFontSize();
     for (int i = 0, index = 0; i < m_nChars; ++i) {
         FX_DWORD charcode = m_nChars == 1 ?
             (FX_DWORD)(uintptr_t)m_pCharCodes : m_pCharCodes[i];
         if (charcode == (FX_DWORD) - 1) {
             continue;
@@ skipping 129 matching lines @@
 }
 void CPDF_FormObject::CalcBoundingBox()
 {
     CFX_FloatRect form_rect = m_pForm->CalcBoundingBox();
     form_rect.Transform(&m_FormMatrix);
     m_Left = form_rect.left;
     m_Bottom = form_rect.bottom;
     m_Right = form_rect.right;
     m_Top = form_rect.top;
 }
-CPDF_PageObjects::CPDF_PageObjects(bool bReleaseMembers) : m_ObjectList(128)
+CPDF_PageObjects::CPDF_PageObjects(FX_BOOL bReleaseMembers) : m_ObjectList(128)
 {
-    m_bBackgroundAlphaNeeded = false;
+    m_bBackgroundAlphaNeeded = FALSE;
     m_bReleaseMembers = bReleaseMembers;
     m_ParseState = PDF_CONTENT_NOT_PARSED;
     m_pParser = NULL;
     m_pFormStream = NULL;
     m_pResources = NULL;
 }
 CPDF_PageObjects::~CPDF_PageObjects()
 {
     delete m_pParser;
     if (!m_bReleaseMembers) {
@@ skipping 115 matching lines @@
         while (pos) {
             delete (CPDF_PageObject*)m_ObjectList.GetNext(pos);
         }
     }
     m_ObjectList.RemoveAll();
 }
 CPDF_Page::CPDF_Page()
 {
     m_pPageRender = NULL;
 }
-void CPDF_Page::Load(CPDF_Document* pDocument, CPDF_Dictionary* pPageDict, bool bPageCache)
+void CPDF_Page::Load(CPDF_Document* pDocument, CPDF_Dictionary* pPageDict, FX_BOOL bPageCache)
 {
     m_pDocument = (CPDF_Document*)pDocument;
     m_pFormDict = pPageDict;
     if (bPageCache) {
         m_pPageRender = CPDF_ModuleMgr::Get()->GetRenderModule()->CreatePageCache(this);
     }
     if (pPageDict == NULL) {
         m_PageWidth = m_PageHeight = 100 * 1.0f;
         m_pPageResources = m_pResources = NULL;
         return;
@@ skipping 46 matching lines @@
         case 2:
             m_PageMatrix.Set(-1.0f, 0, 0, -1.0f, m_BBox.right, m_BBox.top);
             break;
         case 3:
             m_PageMatrix.Set(0, 1.0f, -1.0f, 0, m_BBox.top, -m_BBox.left);
             break;
     }
     m_Transparency = PDFTRANS_ISOLATED;
     LoadTransInfo();
 }
-void CPDF_Page::StartParse(CPDF_ParseOptions* pOptions, bool bReParse)
+void CPDF_Page::StartParse(CPDF_ParseOptions* pOptions, FX_BOOL bReParse)
 {
     if (bReParse) {
         ClearCacheObjects();
     }
     if (m_ParseState == PDF_CONTENT_PARSED || m_ParseState == PDF_CONTENT_PARSING) {
         return;
     }
     m_pParser = new CPDF_ContentParser;
     m_pParser->Start(this, pOptions);
     m_ParseState = PDF_CONTENT_PARSING;
 }
-void CPDF_Page::ParseContent(CPDF_ParseOptions* pOptions, bool bReParse)
+void CPDF_Page::ParseContent(CPDF_ParseOptions* pOptions, FX_BOOL bReParse)
 {
     StartParse(pOptions, bReParse);
     ContinueParse(NULL);
 }
 CPDF_Page::~CPDF_Page()
 {
     if (m_pPageRender) {
         IPDF_RenderModule* pModule = CPDF_ModuleMgr::Get()->GetRenderModule();
         pModule->DestroyPageCache(m_pPageRender);
     }
@@ skipping 112 matching lines @@
     display_matrix.Set(FXSYS_Div((FX_FLOAT)(x2 - x0), m_PageWidth),
                        FXSYS_Div((FX_FLOAT)(y2 - y0), m_PageWidth),
                        FXSYS_Div((FX_FLOAT)(x1 - x0), m_PageHeight),
                        FXSYS_Div((FX_FLOAT)(y1 - y0), m_PageHeight),
                        (FX_FLOAT)x0, (FX_FLOAT)y0);
     matrix = m_PageMatrix;
     matrix.Concat(display_matrix);
 }
 CPDF_ParseOptions::CPDF_ParseOptions()
 {
-    m_bTextOnly = false;
-    m_bMarkedContent = true;
-    m_bSeparateForm = true;
-    m_bDecodeInlineImage = false;
+    m_bTextOnly = FALSE;
+    m_bMarkedContent = TRUE;
+    m_bSeparateForm = TRUE;
+    m_bDecodeInlineImage = FALSE;
 }