Convert border style defines to an enum class.

core/fpdfdoc/cpvt_generateap.cpp

 // Copyright 2016 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 "core/fpdfdoc/cpvt_generateap.h"
 
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
@@ skipping 89 matching lines @@
                           rcAnnot.top - rcAnnot.bottom);
       rcBBox = CFX_FloatRect(0, 0, rcAnnot.right - rcAnnot.left,
                              rcAnnot.top - rcAnnot.bottom);
       break;
     case 270:
       matrix = CFX_Matrix(0, -1, 1, 0, 0, rcAnnot.top - rcAnnot.bottom);
       rcBBox = CFX_FloatRect(0, 0, rcAnnot.top - rcAnnot.bottom,
                              rcAnnot.right - rcAnnot.left);
       break;
   }
-  int32_t nBorderStyle = PBS_SOLID;
+
+  BorderStyle nBorderStyle = BorderStyle::SOLID;
   FX_FLOAT fBorderWidth = 1;
   CPVT_Dash dsBorder(3, 0, 0);
   CPVT_Color crLeftTop, crRightBottom;
   if (CPDF_Dictionary* pBSDict = pAnnotDict->GetDictBy("BS")) {
     if (pBSDict->KeyExist("W"))
       fBorderWidth = pBSDict->GetNumberBy("W");
 
     if (CPDF_Array* pArray = pBSDict->GetArrayBy("D")) {
       dsBorder = CPVT_Dash(pArray->GetIntegerAt(0), pArray->GetIntegerAt(1),
                            pArray->GetIntegerAt(2));
     }
     switch (pBSDict->GetStringBy("S").GetAt(0)) {
       case 'S':
-        nBorderStyle = PBS_SOLID;
+        nBorderStyle = BorderStyle::SOLID;
         break;
       case 'D':
-        nBorderStyle = PBS_DASH;
+        nBorderStyle = BorderStyle::DASH;
         break;
       case 'B':
-        nBorderStyle = PBS_BEVELED;
+        nBorderStyle = BorderStyle::BEVELED;
         fBorderWidth *= 2;
         crLeftTop = CPVT_Color(CPVT_Color::kGray, 1);
         crRightBottom = CPVT_Color(CPVT_Color::kGray, 0.5);
         break;
       case 'I':
-        nBorderStyle = PBS_INSET;
+        nBorderStyle = BorderStyle::INSET;
         fBorderWidth *= 2;
         crLeftTop = CPVT_Color(CPVT_Color::kGray, 0.5);
         crRightBottom = CPVT_Color(CPVT_Color::kGray, 0.75);
         break;
       case 'U':
-        nBorderStyle = PBS_UNDERLINED;
+        nBorderStyle = BorderStyle::UNDERLINE;
         break;
     }
   }
   CPVT_Color crBorder, crBG;
   if (CPDF_Dictionary* pMKDict = pAnnotDict->GetDictBy("MK")) {
     if (CPDF_Array* pArray = pMKDict->GetArrayBy("BC"))
       crBorder = CPVT_Color::ParseColor(*pArray);
     if (CPDF_Array* pArray = pMKDict->GetArrayBy("BG"))
       crBG = CPVT_Color::ParseColor(*pArray);
   }
@@ skipping 158 matching lines @@
                      220.0f / 255.0f),
           TRUE);
       if (sButton.GetLength() > 0 && !rcButton.IsEmpty()) {
         sAppStream << "q\n" << sButton;
         sAppStream << rcButton.left << " " << rcButton.bottom << " "
                    << rcButton.Width() << " " << rcButton.Height() << " re f\n";
         sAppStream << "Q\n";
         CFX_ByteString sButtonBorder = CPVT_GenerateAP::GenerateBorderAP(
             rcButton, 2, CPVT_Color(CPVT_Color::kGray, 0),
             CPVT_Color(CPVT_Color::kGray, 1),
-            CPVT_Color(CPVT_Color::kGray, 0.5), PBS_BEVELED,
+            CPVT_Color(CPVT_Color::kGray, 0.5), BorderStyle::BEVELED,
             CPVT_Dash(3, 0, 0));
         if (sButtonBorder.GetLength() > 0)
           sAppStream << "q\n" << sButtonBorder << "Q\n";
 
         CFX_FloatPoint ptCenter =
             CFX_FloatPoint((rcButton.left + rcButton.right) / 2,
                            (rcButton.top + rcButton.bottom) / 2);
         if (IsFloatBigger(rcButton.Width(), 6) &&
             IsFloatBigger(rcButton.Height(), 6)) {
           sAppStream << "q\n"
@@ skipping 250 matching lines @@
   return sEditStream.MakeString();
 }
 
 // Static.
 CFX_ByteString CPVT_GenerateAP::GenerateBorderAP(
     const CFX_FloatRect& rect,
     FX_FLOAT fWidth,
     const CPVT_Color& color,
     const CPVT_Color& crLeftTop,
     const CPVT_Color& crRightBottom,
-    int32_t nStyle,
+    BorderStyle nStyle,
     const CPVT_Dash& dash) {
   CFX_ByteTextBuf sAppStream;
   CFX_ByteString sColor;
   FX_FLOAT fLeft = rect.left;
   FX_FLOAT fRight = rect.right;
   FX_FLOAT fTop = rect.top;
   FX_FLOAT fBottom = rect.bottom;
   if (fWidth > 0.0f) {
     FX_FLOAT fHalfWidth = fWidth / 2.0f;
     switch (nStyle) {
       default:
-      case PBS_SOLID:
+      case BorderStyle::SOLID:
         sColor = GenerateColorAP(color, TRUE);
         if (sColor.GetLength() > 0) {
           sAppStream << sColor;
           sAppStream << fLeft << " " << fBottom << " " << fRight - fLeft << " "
                      << fTop - fBottom << " re\n";
           sAppStream << fLeft + fWidth << " " << fBottom + fWidth << " "
                      << fRight - fLeft - fWidth * 2 << " "
                      << fTop - fBottom - fWidth * 2 << " re\n";
           sAppStream << "f*\n";
         }
         break;
-      case PBS_DASH:
+      case BorderStyle::DASH:
         sColor = GenerateColorAP(color, FALSE);
         if (sColor.GetLength() > 0) {
           sAppStream << sColor;
           sAppStream << fWidth << " w"
                      << " [" << dash.nDash << " " << dash.nGap << "] "
                      << dash.nPhase << " d\n";
           sAppStream << fLeft + fWidth / 2 << " " << fBottom + fWidth / 2
                      << " m\n";
           sAppStream << fLeft + fWidth / 2 << " " << fTop - fWidth / 2
                      << " l\n";
           sAppStream << fRight - fWidth / 2 << " " << fTop - fWidth / 2
                      << " l\n";
           sAppStream << fRight - fWidth / 2 << " " << fBottom + fWidth / 2
                      << " l\n";
           sAppStream << fLeft + fWidth / 2 << " " << fBottom + fWidth / 2
                      << " l S\n";
         }
         break;
-      case PBS_BEVELED:
-      case PBS_INSET:
+      case BorderStyle::BEVELED:
+      case BorderStyle::INSET:
         sColor = GenerateColorAP(crLeftTop, TRUE);
         if (sColor.GetLength() > 0) {
           sAppStream << sColor;
           sAppStream << fLeft + fHalfWidth << " " << fBottom + fHalfWidth
                      << " m\n";
           sAppStream << fLeft + fHalfWidth << " " << fTop - fHalfWidth
                      << " l\n";
           sAppStream << fRight - fHalfWidth << " " << fTop - fHalfWidth
                      << " l\n";
           sAppStream << fRight - fHalfWidth * 2 << " " << fTop - fHalfWidth * 2
@@ skipping 22 matching lines @@
         sColor = GenerateColorAP(color, TRUE);
         if (sColor.GetLength() > 0) {
           sAppStream << sColor;
           sAppStream << fLeft << " " << fBottom << " " << fRight - fLeft << " "
                      << fTop - fBottom << " re\n";
           sAppStream << fLeft + fHalfWidth << " " << fBottom + fHalfWidth << " "
                      << fRight - fLeft - fHalfWidth * 2 << " "
                      << fTop - fBottom - fHalfWidth * 2 << " re f*\n";
         }
         break;
-      case PBS_UNDERLINED:
+      case BorderStyle::UNDERLINE:
         sColor = GenerateColorAP(color, FALSE);
         if (sColor.GetLength() > 0) {
           sAppStream << sColor;
           sAppStream << fWidth << " w\n";
           sAppStream << fLeft << " " << fBottom + fWidth / 2 << " m\n";
           sAppStream << fRight << " " << fBottom + fWidth / 2 << " l S\n";
         }
         break;
     }
   }
@@ skipping 65 matching lines @@
                                                  int32_t nFontIndex,
                                                  FX_FLOAT fFontSize) {
   CFX_ByteTextBuf sRet;
   if (pFontMap) {
     CFX_ByteString sFontAlias = pFontMap->GetPDFFontAlias(nFontIndex);
     if (sFontAlias.GetLength() > 0 && fFontSize > 0)
       sRet << "/" << sFontAlias << " " << fFontSize << " Tf\n";
   }
   return sRet.MakeString();
 }