Convert border style defines to an enum class.

fpdfsdk/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 <algorithm>
 
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_number.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h"
 #include "core/fxcrt/include/fx_ext.h"
 #include "fpdfsdk/include/fsdk_baseannot.h"
 #include "fpdfsdk/include/fsdk_define.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 
 #ifdef PDF_ENABLE_XFA
 #include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h"
 #endif  // PDF_ENABLE_XFA
 
+namespace {
+
+const float kMinWidth = 1.0f;
+const float kMinHeight = 1.0f;
+
 int gAfxGetTimeZoneInSeconds(int8_t tzhour, uint8_t tzminute) {
   return (int)tzhour * 3600 + (int)tzminute * (tzhour >= 0 ? 60 : -60);
 }
 
-FX_BOOL _gAfxIsLeapYear(int16_t year) {
+bool gAfxIsLeapYear(int16_t year) {
   return ((year % 400 == 0) || ((year % 4 == 0) && (year % 100 != 0)));
 }
 
-uint16_t _gAfxGetYearDays(int16_t year) {
-  return (_gAfxIsLeapYear(year) == TRUE ? 366 : 365);
+uint16_t gAfxGetYearDays(int16_t year) {
+  return (gAfxIsLeapYear(year) ? 366 : 365);
 }
 
-uint8_t _gAfxGetMonthDays(int16_t year, uint8_t month) {
+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))
         mDays = 29;
       else
         mDays = 28;
       break;
 
     default:
       mDays = 0;
       break;
   }
 
   return mDays;
 }
 
+}  // namespace
+
 CPDFSDK_DateTime::CPDFSDK_DateTime() {
   ResetDateTime();
 }
 
 CPDFSDK_DateTime::CPDFSDK_DateTime(const CFX_ByteString& dtStr) {
   ResetDateTime();
 
   FromPDFDateTimeString(dtStr);
 }
 
@@ skipping 320 matching lines @@
   int16_t y = dt.year, yy;
   uint8_t m = dt.month;
   uint8_t d = dt.day;
   int mdays, ydays, ldays;
 
   ldays = days;
   if (ldays > 0) {
     yy = y;
     if (((uint16_t)m * 100 + d) > 300)
       yy++;
-    ydays = _gAfxGetYearDays(yy);
+    ydays = gAfxGetYearDays(yy);
     while (ldays >= ydays) {
       y++;
       ldays -= ydays;
       yy++;
-      mdays = _gAfxGetMonthDays(y, m);
+      mdays = gAfxGetMonthDays(y, m);
       if (d > mdays) {
         m++;
         d -= mdays;
       }
-      ydays = _gAfxGetYearDays(yy);
+      ydays = gAfxGetYearDays(yy);
     }
-    mdays = _gAfxGetMonthDays(y, m) - d + 1;
+    mdays = gAfxGetMonthDays(y, m) - d + 1;
     while (ldays >= mdays) {
       ldays -= mdays;
       m++;
       d = 1;
-      mdays = _gAfxGetMonthDays(y, m);
+      mdays = gAfxGetMonthDays(y, m);
     }
     d += ldays;
   } else {
     ldays *= -1;
     yy = y;
     if (((uint16_t)m * 100 + d) < 300)
       yy--;
-    ydays = _gAfxGetYearDays(yy);
+    ydays = gAfxGetYearDays(yy);
     while (ldays >= ydays) {
       y--;
       ldays -= ydays;
       yy--;
-      mdays = _gAfxGetMonthDays(y, m);
+      mdays = gAfxGetMonthDays(y, m);
       if (d > mdays) {
         m++;
         d -= mdays;
       }
-      ydays = _gAfxGetYearDays(yy);
+      ydays = gAfxGetYearDays(yy);
     }
     while (ldays >= d) {
       ldays -= d;
       m--;
-      mdays = _gAfxGetMonthDays(y, m);
+      mdays = gAfxGetMonthDays(y, m);
       d = mdays;
     }
     d -= ldays;
   }
 
   dt.year = y;
   dt.month = m;
   dt.day = d;
 
   return *this;
@@ skipping 210 matching lines @@
 int CPDFSDK_BAAnnot::GetBorderWidth() const {
   if (CPDF_Array* pBorder = m_pAnnot->GetAnnotDict()->GetArrayBy("Border")) {
     return pBorder->GetIntegerAt(2);
   }
   if (CPDF_Dictionary* pBSDict = m_pAnnot->GetAnnotDict()->GetDictBy("BS")) {
     return pBSDict->GetIntegerBy("W", 1);
   }
   return 1;
 }
 
-void CPDFSDK_BAAnnot::SetBorderStyle(int nStyle) {
+void CPDFSDK_BAAnnot::SetBorderStyle(BorderStyle nStyle) {
   CPDF_Dictionary* pBSDict = m_pAnnot->GetAnnotDict()->GetDictBy("BS");
   if (!pBSDict) {
     pBSDict = new CPDF_Dictionary;
     m_pAnnot->GetAnnotDict()->SetAt("BS", pBSDict);
   }
 
   switch (nStyle) {
-    case BBS_SOLID:
+    case BorderStyle::SOLID:
       pBSDict->SetAtName("S", "S");
       break;
-    case BBS_DASH:
+    case BorderStyle::DASH:
       pBSDict->SetAtName("S", "D");
       break;
-    case BBS_BEVELED:
+    case BorderStyle::BEVELED:
       pBSDict->SetAtName("S", "B");
       break;
-    case BBS_INSET:
+    case BorderStyle::INSET:
       pBSDict->SetAtName("S", "I");
       break;
-    case BBS_UNDERLINE:
+    case BorderStyle::UNDERLINE:
       pBSDict->SetAtName("S", "U");
       break;
+    default:
+      break;
   }
 }
 
-int CPDFSDK_BAAnnot::GetBorderStyle() const {
+BorderStyle CPDFSDK_BAAnnot::GetBorderStyle() const {
   CPDF_Dictionary* pBSDict = m_pAnnot->GetAnnotDict()->GetDictBy("BS");
   if (pBSDict) {
     CFX_ByteString sBorderStyle = pBSDict->GetStringBy("S", "S");
     if (sBorderStyle == "S")
-      return BBS_SOLID;
+      return BorderStyle::SOLID;
     if (sBorderStyle == "D")
-      return BBS_DASH;
+      return BorderStyle::DASH;
     if (sBorderStyle == "B")
-      return BBS_BEVELED;
+      return BorderStyle::BEVELED;
     if (sBorderStyle == "I")
-      return BBS_INSET;
+      return BorderStyle::INSET;
     if (sBorderStyle == "U")
-      return BBS_UNDERLINE;
+      return BorderStyle::UNDERLINE;
   }
 
   CPDF_Array* pBorder = m_pAnnot->GetAnnotDict()->GetArrayBy("Border");
   if (pBorder) {
     if (pBorder->GetCount() >= 4) {
       CPDF_Array* pDP = pBorder->GetArrayAt(3);
       if (pDP && pDP->GetCount() > 0)
-        return BBS_DASH;
+        return BorderStyle::DASH;
     }
   }
 
-  return BBS_SOLID;
+  return BorderStyle::SOLID;
 }
 
 void CPDFSDK_BAAnnot::SetColor(FX_COLORREF color) {
   CPDF_Array* pArray = new CPDF_Array;
   pArray->AddNumber((FX_FLOAT)FXSYS_GetRValue(color) / 255.0f);
   pArray->AddNumber((FX_FLOAT)FXSYS_GetGValue(color) / 255.0f);
   pArray->AddNumber((FX_FLOAT)FXSYS_GetBValue(color) / 255.0f);
   m_pAnnot->GetAnnotDict()->SetAt("C", pArray);
 }
 
@@ skipping 83 matching lines @@
 
   if (pStreamDict) {
     pStreamDict->SetAtMatrix("Matrix", matrix);
     pStreamDict->SetAtRect("BBox", rcBBox);
   }
 
   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;
+  return kMinWidth;
 }
 
 FX_FLOAT CPDFSDK_Annot::GetMinHeight() const {
-  return BA_ANNOT_MINHEIGHT;
+  return kMinHeight;
 }
 
 FX_BOOL CPDFSDK_BAAnnot::CreateFormFiller() {
   return TRUE;
 }
 FX_BOOL CPDFSDK_BAAnnot::IsVisible() const {
   uint32_t nFlags = GetFlags();
   return !((nFlags & ANNOTFLAG_INVISIBLE) || (nFlags & ANNOTFLAG_HIDDEN) ||
            (nFlags & ANNOTFLAG_NOVIEW));
 }
@@ skipping 67 matching lines @@
 
 CPDF_Page* CPDFSDK_Annot::GetPDFPage() {
   return m_pPageView ? m_pPageView->GetPDFPage() : nullptr;
 }
 
 #ifdef PDF_ENABLE_XFA
 CPDFXFA_Page* CPDFSDK_Annot::GetPDFXFAPage() {
   return m_pPageView ? m_pPageView->GetPDFXFAPage() : nullptr;
 }
 #endif  // PDF_ENABLE_XFA