Use PaintOperation instead of bFillOrStroke in CPVT_GenerateAP.

core/fpdfdoc/doc_utils.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 <vector>
 
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
@@ skipping 99 matching lines @@
     return;
   }
   CPDF_SimpleParser syntax(m_csDA.AsStringC());
   if (syntax.FindTagParamFromStart("Tf", 2)) {
     csFontNameTag = CFX_ByteString(syntax.GetWord());
     csFontNameTag.Delete(0, 1);
     fFontSize = FX_atof(syntax.GetWord());
   }
   csFontNameTag = PDF_NameDecode(csFontNameTag);
 }
-FX_BOOL CPDF_DefaultAppearance::HasColor(FX_BOOL bStrokingOperation) {
+FX_BOOL CPDF_DefaultAppearance::HasColor(PaintOperation nOperation) {
   if (m_csDA.IsEmpty()) {
     return FALSE;
   }
   CPDF_SimpleParser syntax(m_csDA.AsStringC());
-  if (syntax.FindTagParamFromStart(bStrokingOperation ? "G" : "g", 1)) {
+  if (syntax.FindTagParamFromStart(
+          (nOperation == PaintOperation::STROKE ? "G" : "g"), 1)) {
     return TRUE;
   }
-  if (syntax.FindTagParamFromStart(bStrokingOperation ? "RG" : "rg", 3)) {
+  if (syntax.FindTagParamFromStart(
+          (nOperation == PaintOperation::STROKE ? "RG" : "rg"), 3)) {
     return TRUE;
   }
-  return syntax.FindTagParamFromStart(bStrokingOperation ? "K" : "k", 4);
+  return syntax.FindTagParamFromStart(
+      (nOperation == PaintOperation::STROKE ? "K" : "k"), 4);
 }
 CFX_ByteString CPDF_DefaultAppearance::GetColorString(
-    FX_BOOL bStrokingOperation) {
+    PaintOperation nOperation) {
   CFX_ByteString csColor;
   if (m_csDA.IsEmpty()) {
     return csColor;
   }
   CPDF_SimpleParser syntax(m_csDA.AsStringC());
-  if (syntax.FindTagParamFromStart(bStrokingOperation ? "G" : "g", 1)) {
+  if (syntax.FindTagParamFromStart(
+          (nOperation == PaintOperation::STROKE ? "G" : "g"), 1)) {
     csColor += syntax.GetWord();
     csColor += " ";
     csColor += syntax.GetWord();
     return csColor;
   }
-  if (syntax.FindTagParamFromStart(bStrokingOperation ? "RG" : "rg", 3)) {
+  if (syntax.FindTagParamFromStart(
+          (nOperation == PaintOperation::STROKE ? "RG" : "rg"), 3)) {
     csColor += syntax.GetWord();
     csColor += " ";
     csColor += syntax.GetWord();
     csColor += " ";
     csColor += syntax.GetWord();
     csColor += " ";
     csColor += syntax.GetWord();
     return csColor;
   }
-  if (syntax.FindTagParamFromStart(bStrokingOperation ? "K" : "k", 4)) {
+  if (syntax.FindTagParamFromStart(
+          (nOperation == PaintOperation::STROKE ? "K" : "k"), 4)) {
     csColor += syntax.GetWord();
     csColor += " ";
     csColor += syntax.GetWord();
     csColor += " ";
     csColor += syntax.GetWord();
     csColor += " ";
     csColor += syntax.GetWord();
     csColor += " ";
     csColor += syntax.GetWord();
   }
   return csColor;
 }
 void CPDF_DefaultAppearance::GetColor(int& iColorType,
                                       FX_FLOAT fc[4],
-                                      FX_BOOL bStrokingOperation) {
+                                      PaintOperation nOperation) {
   iColorType = COLORTYPE_TRANSPARENT;
   for (int c = 0; c < 4; c++) {
     fc[c] = 0;
   }
   if (m_csDA.IsEmpty()) {
     return;
   }
   CPDF_SimpleParser syntax(m_csDA.AsStringC());
-  if (syntax.FindTagParamFromStart(bStrokingOperation ? "G" : "g", 1)) {
+  if (syntax.FindTagParamFromStart(
+          (nOperation == PaintOperation::STROKE ? "G" : "g"), 1)) {
     iColorType = COLORTYPE_GRAY;
     fc[0] = FX_atof(syntax.GetWord());
     return;
   }
-  if (syntax.FindTagParamFromStart(bStrokingOperation ? "RG" : "rg", 3)) {
+  if (syntax.FindTagParamFromStart(
+          (nOperation == PaintOperation::STROKE ? "RG" : "rg"), 3)) {
     iColorType = COLORTYPE_RGB;
     fc[0] = FX_atof(syntax.GetWord());
     fc[1] = FX_atof(syntax.GetWord());
     fc[2] = FX_atof(syntax.GetWord());
     return;
   }
-  if (syntax.FindTagParamFromStart(bStrokingOperation ? "K" : "k", 4)) {
+  if (syntax.FindTagParamFromStart(
+          (nOperation == PaintOperation::STROKE ? "K" : "k"), 4)) {
     iColorType = COLORTYPE_CMYK;
     fc[0] = FX_atof(syntax.GetWord());
     fc[1] = FX_atof(syntax.GetWord());
     fc[2] = FX_atof(syntax.GetWord());
     fc[3] = FX_atof(syntax.GetWord());
   }
 }
 void CPDF_DefaultAppearance::GetColor(FX_ARGB& color,
                                       int& iColorType,
-                                      FX_BOOL bStrokingOperation) {
+                                      PaintOperation nOperation) {
   color = 0;
   iColorType = COLORTYPE_TRANSPARENT;
   if (m_csDA.IsEmpty()) {
     return;
   }
   CPDF_SimpleParser syntax(m_csDA.AsStringC());
-  if (syntax.FindTagParamFromStart(bStrokingOperation ? "G" : "g", 1)) {
+  if (syntax.FindTagParamFromStart(
+          (nOperation == PaintOperation::STROKE ? "G" : "g"), 1)) {
     iColorType = COLORTYPE_GRAY;
     FX_FLOAT g = FX_atof(syntax.GetWord()) * 255 + 0.5f;
     color = ArgbEncode(255, (int)g, (int)g, (int)g);
     return;
   }
-  if (syntax.FindTagParamFromStart(bStrokingOperation ? "RG" : "rg", 3)) {
+  if (syntax.FindTagParamFromStart(
+          (nOperation == PaintOperation::STROKE ? "RG" : "rg"), 3)) {
     iColorType = COLORTYPE_RGB;
     FX_FLOAT r = FX_atof(syntax.GetWord()) * 255 + 0.5f;
     FX_FLOAT g = FX_atof(syntax.GetWord()) * 255 + 0.5f;
     FX_FLOAT b = FX_atof(syntax.GetWord()) * 255 + 0.5f;
     color = ArgbEncode(255, (int)r, (int)g, (int)b);
     return;
   }
-  if (syntax.FindTagParamFromStart(bStrokingOperation ? "K" : "k", 4)) {
+  if (syntax.FindTagParamFromStart(
+          (nOperation == PaintOperation::STROKE ? "K" : "k"), 4)) {
     iColorType = COLORTYPE_CMYK;
     FX_FLOAT c = FX_atof(syntax.GetWord());
     FX_FLOAT m = FX_atof(syntax.GetWord());
     FX_FLOAT y = FX_atof(syntax.GetWord());
     FX_FLOAT k = FX_atof(syntax.GetWord());
     FX_FLOAT r = 1.0f - std::min(1.0f, c + k);
     FX_FLOAT g = 1.0f - std::min(1.0f, m + k);
     FX_FLOAT b = 1.0f - std::min(1.0f, y + k);
     color = ArgbEncode(255, (int)(r * 255 + 0.5f), (int)(g * 255 + 0.5f),
                        (int)(b * 255 + 0.5f));
@@ skipping 515 matching lines @@
   CPDF_Object* pAttr = pFieldDict->GetDirectObjectBy(name);
   if (pAttr) {
     return pAttr;
   }
   CPDF_Dictionary* pParent = pFieldDict->GetDictBy("Parent");
   if (!pParent) {
     return nullptr;
   }
   return FPDF_GetFieldAttr(pParent, name, nLevel + 1);
 }