Revert "FX_BOOL considered harmful, part 2."

fpdfsdk/src/fsdk_baseannot.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/fsdk_define.h"
 #include "../include/fsdk_mgr.h"
 #include "../include/fsdk_baseannot.h"
 
 
 //---------------------------------------------------------------------------
 //                              CPDFSDK_DateTime
 //---------------------------------------------------------------------------
 int _gAfxGetTimeZoneInSeconds(FX_CHAR tzhour, uint8_t tzminute)
 {
     return (int)tzhour * 3600 + (int)tzminute * (tzhour >= 0 ? 60 : -60);
 }
 
-bool _gAfxIsLeapYear(int16_t year)
+FX_BOOL _gAfxIsLeapYear(int16_t year)
 {
     return ((year % 400 == 0) || ((year % 4 == 0) && (year % 100 != 0)));
 }
 
 FX_WORD _gAfxGetYearDays(int16_t year)
 {
-    return (_gAfxIsLeapYear(year) == true ? 366 : 365);
+    return (_gAfxIsLeapYear(year) == TRUE ? 366 : 365);
 }
 
 uint8_t _gAfxGetMonthDays(int16_t year, uint8_t month)
 {
     uint8_t mDays;
     switch (month)
     {
     case 1:
     case 3:
     case 5:
     case 7:
     case 8:
     case 10:
     case 12:
         mDays = 31;
         break;
 
     case 4:
     case 6:
     case 9:
     case 11:
         mDays = 30;
         break;
 
     case 2:
-        if (_gAfxIsLeapYear(year) == true)
+        if (_gAfxIsLeapYear(year) == TRUE)
             mDays = 29;
         else
             mDays = 28;
         break;
 
     default:
         mDays = 0;
         break;
     }
 
@@ skipping 57 matching lines @@
     dt.month = (uint8_t)st.wMonth;
     dt.day = (uint8_t)st.wDay;
     dt.hour = (uint8_t)st.wHour;
     dt.minute = (uint8_t)st.wMinute;
     dt.second = (uint8_t)st.wSecond;
 //  dt.tzHour = _timezone / 3600 * -1;
 //  dt.tzMinute = (abs(_timezone) % 3600) / 60;
     return *this;
 }
 
-bool CPDFSDK_DateTime::operator == (CPDFSDK_DateTime& datetime)
+FX_BOOL CPDFSDK_DateTime::operator == (CPDFSDK_DateTime& datetime)
 {
     return (FXSYS_memcmp(&dt, &datetime.dt, sizeof(FX_DATETIME)) == 0);
 }
 
-bool CPDFSDK_DateTime::operator != (CPDFSDK_DateTime& datetime)
+FX_BOOL CPDFSDK_DateTime::operator != (CPDFSDK_DateTime& datetime)
 {
     return (FXSYS_memcmp(&dt, &datetime.dt, sizeof(FX_DATETIME)) != 0);
 }
 
-bool CPDFSDK_DateTime::operator > (CPDFSDK_DateTime& datetime)
+FX_BOOL CPDFSDK_DateTime::operator > (CPDFSDK_DateTime& datetime)
 {
     CPDFSDK_DateTime dt1 = ToGMT();
     CPDFSDK_DateTime dt2 = datetime.ToGMT();
     int d1 = (((int)dt1.dt.year) << 16) | (((int)dt1.dt.month) << 8) | (int)dt1.dt.day;
     int d2 = (((int)dt1.dt.hour) << 16) | (((int)dt1.dt.minute) << 8) | (int)dt1.dt.second;
     int d3 = (((int)dt2.dt.year) << 16) | (((int)dt2.dt.month) << 8) | (int)dt2.dt.day;
     int d4 = (((int)dt2.dt.hour) << 16) | (((int)dt2.dt.minute) << 8) | (int)dt2.dt.second;
 
-    if (d1 > d3) return true;
-    if (d2 > d4) return true;
-    return false;
+    if (d1 > d3) return TRUE;
+    if (d2 > d4) return TRUE;
+    return FALSE;
 }
 
-bool CPDFSDK_DateTime::operator >= (CPDFSDK_DateTime& datetime)
+FX_BOOL CPDFSDK_DateTime::operator >= (CPDFSDK_DateTime& datetime)
 {
     CPDFSDK_DateTime dt1 = ToGMT();
     CPDFSDK_DateTime dt2 = datetime.ToGMT();
     int d1 = (((int)dt1.dt.year) << 16) | (((int)dt1.dt.month) << 8) | (int)dt1.dt.day;
     int d2 = (((int)dt1.dt.hour) << 16) | (((int)dt1.dt.minute) << 8) | (int)dt1.dt.second;
     int d3 = (((int)dt2.dt.year) << 16) | (((int)dt2.dt.month) << 8) | (int)dt2.dt.day;
     int d4 = (((int)dt2.dt.hour) << 16) | (((int)dt2.dt.minute) << 8) | (int)dt2.dt.second;
 
-    if (d1 >= d3) return true;
-    if (d2 >= d4) return true;
-    return false;
+    if (d1 >= d3) return TRUE;
+    if (d2 >= d4) return TRUE;
+    return FALSE;
 }
 
-bool CPDFSDK_DateTime::operator < (CPDFSDK_DateTime& datetime)
+FX_BOOL CPDFSDK_DateTime::operator < (CPDFSDK_DateTime& datetime)
 {
     CPDFSDK_DateTime dt1 = ToGMT();
     CPDFSDK_DateTime dt2 = datetime.ToGMT();
     int d1 = (((int)dt1.dt.year) << 16) | (((int)dt1.dt.month) << 8) | (int)dt1.dt.day;
     int d2 = (((int)dt1.dt.hour) << 16) | (((int)dt1.dt.minute) << 8) | (int)dt1.dt.second;
     int d3 = (((int)dt2.dt.year) << 16) | (((int)dt2.dt.month) << 8) | (int)dt2.dt.day;
     int d4 = (((int)dt2.dt.hour) << 16) | (((int)dt2.dt.minute) << 8) | (int)dt2.dt.second;
 
-    if (d1 < d3) return true;
-    if (d2 < d4) return true;
-    return false;
+    if (d1 < d3) return TRUE;
+    if (d2 < d4) return TRUE;
+    return FALSE;
 }
 
-bool CPDFSDK_DateTime::operator <= (CPDFSDK_DateTime& datetime)
+FX_BOOL CPDFSDK_DateTime::operator <= (CPDFSDK_DateTime& datetime)
 {
     CPDFSDK_DateTime dt1 = ToGMT();
     CPDFSDK_DateTime dt2 = datetime.ToGMT();
     int d1 = (((int)dt1.dt.year) << 16) | (((int)dt1.dt.month) << 8) | (int)dt1.dt.day;
     int d2 = (((int)dt1.dt.hour) << 16) | (((int)dt1.dt.minute) << 8) | (int)dt1.dt.second;
     int d3 = (((int)dt2.dt.year) << 16) | (((int)dt2.dt.month) << 8) | (int)dt2.dt.day;
     int d4 = (((int)dt2.dt.hour) << 16) | (((int)dt2.dt.minute) << 8) | (int)dt2.dt.second;
 
-    if (d1 <= d3) return true;
-    if (d2 <= d4) return true;
-    return false;
+    if (d1 <= d3) return TRUE;
+    if (d2 <= d4) return TRUE;
+    return FALSE;
 }
 
 CPDFSDK_DateTime::operator time_t()
 {
     struct tm newtime;
 
     newtime.tm_year = dt.year - 1900;
     newtime.tm_mon = dt.month - 1;
     newtime.tm_mday = dt.day;
     newtime.tm_hour = dt.hour;
@@ skipping 294 matching lines @@
     return *this;
 }
 
 
 //---------------------------------------------------------------------------
 //                              CPDFSDK_Annot
 //---------------------------------------------------------------------------
 CPDFSDK_Annot::CPDFSDK_Annot(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPageView) :
 m_pAnnot(pAnnot),
 m_pPageView(pPageView),
-m_bSelected(false),
+m_bSelected(FALSE),
 m_nTabOrder(-1)
 {
 }
 
 CPDFSDK_Annot::~CPDFSDK_Annot()
 {
     m_pAnnot = NULL;
     m_pPageView = NULL;
 }
 
@@ skipping 12 matching lines @@
 void CPDFSDK_Annot::SetPage(CPDFSDK_PageView* pPageView)
 {
     m_pPageView = pPageView;
 }
 
 CPDFSDK_PageView* CPDFSDK_Annot::GetPageView()
 {
     return m_pPageView;
 }
 
-bool CPDFSDK_Annot::IsSelected()
+FX_BOOL CPDFSDK_Annot::IsSelected()
 {
     return m_bSelected;
 }
 
-void CPDFSDK_Annot::SetSelected(bool bSelected)
+void CPDFSDK_Annot::SetSelected(FX_BOOL bSelected)
 {
     m_bSelected = bSelected;
 }
 
 // Tab Order
 int CPDFSDK_Annot::GetTabOrder()
 {
     return m_nTabOrder;
 }
 
@@ skipping 41 matching lines @@
 
 void CPDFSDK_Annot::DrawAppearance(CFX_RenderDevice* pDevice, const CPDF_Matrix* pUser2Device,
                                    CPDF_Annot::AppearanceMode mode, const CPDF_RenderOptions* pOptions)
 {
     ASSERT(m_pPageView != NULL);
     ASSERT(m_pAnnot != NULL);
 
     m_pAnnot->DrawAppearance(m_pPageView->GetPDFPage(), pDevice, pUser2Device, mode, pOptions);
 }
 
-bool CPDFSDK_Annot::IsAppearanceValid()
+FX_BOOL CPDFSDK_Annot::IsAppearanceValid()
 {
     return m_pAnnot->GetAnnotDict()->GetDict("AP") != NULL;
 }
 
-bool CPDFSDK_Annot::IsAppearanceValid(CPDF_Annot::AppearanceMode mode)
+FX_BOOL CPDFSDK_Annot::IsAppearanceValid(CPDF_Annot::AppearanceMode mode)
 {
     CPDF_Dictionary* pAP = m_pAnnot->GetAnnotDict()->GetDict("AP");
-    if (pAP == NULL) return false;
+    if (pAP == NULL) return FALSE;
 
     // Choose the right sub-ap
     const FX_CHAR* ap_entry = "N";
     if (mode == CPDF_Annot::Down)
         ap_entry = "D";
     else if (mode == CPDF_Annot::Rollover)
         ap_entry = "R";
     if (!pAP->KeyExist(ap_entry))
         ap_entry = "N";
 
     // Get the AP stream or subdirectory
     CPDF_Object* psub = pAP->GetElementValue(ap_entry);
-    if (psub == NULL) return false;
+    if (psub == NULL) return FALSE;
 
-    return true;
+    return TRUE;
 }
 
 void CPDFSDK_Annot::DrawBorder(CFX_RenderDevice* pDevice, const CPDF_Matrix* pUser2Device,
                            const CPDF_RenderOptions* pOptions)
 {
     ASSERT(m_pAnnot != NULL);
     m_pAnnot->DrawBorder(pDevice, pUser2Device, pOptions);
 }
 
 void CPDFSDK_Annot::ClearCachedAP()
@@ skipping 225 matching lines @@
     pArray->AddNumber((FX_FLOAT)FXSYS_GetGValue(color) / 255.0f);
     pArray->AddNumber((FX_FLOAT)FXSYS_GetBValue(color) / 255.0f);
     m_pAnnot->GetAnnotDict()->SetAt("C", pArray);
 }
 
 void CPDFSDK_Annot::RemoveColor()
 {
     m_pAnnot->GetAnnotDict()->RemoveAt("C");
 }
 
-bool CPDFSDK_Annot::GetColor(FX_COLORREF& color) const
+FX_BOOL CPDFSDK_Annot::GetColor(FX_COLORREF& color) const
 {
     if (CPDF_Array* pEntry = m_pAnnot->GetAnnotDict()->GetArray("C"))
     {
         int nCount = pEntry->GetCount();
         if (nCount == 1)
         {
             FX_FLOAT g = pEntry->GetNumber(0) * 255;
 
             color = FXSYS_RGB((int)g, (int)g, (int)g);
 
-            return true;
+            return TRUE;
         }
         else if (nCount == 3)
         {
             FX_FLOAT r = pEntry->GetNumber(0) * 255;
             FX_FLOAT g = pEntry->GetNumber(1) * 255;
             FX_FLOAT b = pEntry->GetNumber(2) * 255;
 
             color = FXSYS_RGB((int)r, (int)g, (int)b);
 
-            return true;
+            return TRUE;
         }
         else if (nCount == 4)
         {
             FX_FLOAT c = pEntry->GetNumber(0);
             FX_FLOAT m = pEntry->GetNumber(1);
             FX_FLOAT y = pEntry->GetNumber(2);
             FX_FLOAT k = pEntry->GetNumber(3);
 
             FX_FLOAT r = 1.0f - FX_MIN(1.0f, c + k);
             FX_FLOAT g = 1.0f - FX_MIN(1.0f, m + k);
             FX_FLOAT b = 1.0f - FX_MIN(1.0f, y + k);
 
             color = FXSYS_RGB((int)(r * 255), (int)(g * 255), (int)(b * 255));
 
-            return true;
+            return TRUE;
         }
     }
 
-    return false;
+    return FALSE;
 }
 
 
 void CPDFSDK_Annot::WriteAppearance(const CFX_ByteString& sAPType, const CPDF_Rect& rcBBox,
                                 const CPDF_Matrix& matrix, const CFX_ByteString& sContents,
                                 const CFX_ByteString& sAPState)
 {
     CPDF_Dictionary* pAPDict = m_pAnnot->GetAnnotDict()->GetDict("AP");
 
     if (!pAPDict)
@@ skipping 40 matching lines @@
         pStreamDict->SetAtInteger("FormType", 1);
         pStream->InitStream(NULL,0,pStreamDict);
     }
 
     if (pStreamDict)
     {
         pStreamDict->SetAtMatrix("Matrix",matrix);
         pStreamDict->SetAtRect("BBox", rcBBox);
     }
 
-    pStream->SetData((uint8_t*)sContents.c_str(), sContents.GetLength(), false, false);
+    pStream->SetData((uint8_t*)sContents.c_str(), sContents.GetLength(), FALSE, FALSE);
 }
 
 #define BA_ANNOT_MINWIDTH           1
 #define BA_ANNOT_MINHEIGHT          1
 
 FX_FLOAT CPDFSDK_Annot::GetMinWidth() const
 {
     return BA_ANNOT_MINWIDTH;
 }
 
 FX_FLOAT CPDFSDK_Annot::GetMinHeight() const
 {
     return BA_ANNOT_MINHEIGHT;
 }
 
-bool CPDFSDK_Annot::CreateFormFiller()
+FX_BOOL CPDFSDK_Annot::CreateFormFiller()
 {
-    return true;
+    return TRUE;
 }
-bool CPDFSDK_Annot::IsVisible() const
+FX_BOOL CPDFSDK_Annot::IsVisible() const
 {
     int nFlags = GetFlags();
     return !((nFlags & ANNOTFLAG_INVISIBLE) || (nFlags & ANNOTFLAG_HIDDEN) || (nFlags & ANNOTFLAG_NOVIEW));
 }
 
 CPDF_Action CPDFSDK_Annot::GetAction() const
 {
     return CPDF_Action(m_pAnnot->GetAnnotDict()->GetDict("A"));
 }
 
@@ skipping 56 matching lines @@
     return ;
 }
 
 CPDF_Page* CPDFSDK_Annot::GetPDFPage()
 {
     if(m_pPageView)
         return m_pPageView->GetPDFPage();
     return NULL;
 }