Give names to the shading types

core/src/fpdfapi/fpdf_page/fpdf_page_parser.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 "../../../include/fpdfapi/fpdf_serial.h"
 #include "pageint.h"
@@ skipping 1074 matching lines @@
   if (nvalues != nargs) {
     CPDF_Pattern* pPattern = FindPattern(GetString(0), FALSE);
     if (pPattern) {
       m_pCurStates->m_ColorState.SetStrokePattern(pPattern, values, nvalues);
     }
   } else {
     m_pCurStates->m_ColorState.SetStrokeColor(NULL, values, nvalues);
   }
   FX_Free(values);
 }
-CFX_FloatRect _GetShadingBBox(CPDF_Stream* pStream,
-                              int type,
-                              const CFX_AffineMatrix* pMatrix,
-                              CPDF_Function** pFuncs,
-                              int nFuncs,
-                              CPDF_ColorSpace* pCS);
+CFX_FloatRect GetShadingBBox(CPDF_Stream* pStream,
+                             ShadingType type,
+                             const CFX_AffineMatrix* pMatrix,
+                             CPDF_Function** pFuncs,
+                             int nFuncs,
+                             CPDF_ColorSpace* pCS);
 void CPDF_StreamContentParser::Handle_ShadeFill() {
   if (m_Options.m_bTextOnly) {
     return;
   }
   CPDF_Pattern* pPattern = FindPattern(GetString(0), TRUE);
   if (pPattern == NULL) {
     return;
   }
   if (pPattern->m_PatternType != PATTERN_SHADING) {
     return;
   }
   CPDF_ShadingPattern* pShading = (CPDF_ShadingPattern*)pPattern;
   if (!pShading->m_bShadingObj) {
     return;
   }
   if (!pShading->Load()) {
     return;
   }
   CPDF_ShadingObject* pObj = new CPDF_ShadingObject;
   pObj->m_pShading = pShading;
   SetGraphicStates(pObj, FALSE, FALSE, FALSE);
   pObj->m_Matrix = m_pCurStates->m_CTM;
   pObj->m_Matrix.Concat(m_mtContentToUser);
   CFX_FloatRect bbox;
   if (!pObj->m_ClipPath.IsNull()) {
     bbox = pObj->m_ClipPath.GetClipBox();
   } else {
     bbox = m_BBox;
   }
-  if (pShading->m_ShadingType >= 4) {
-    bbox.Intersect(_GetShadingBBox(ToStream(pShading->m_pShadingObj),
-                                   pShading->m_ShadingType, &pObj->m_Matrix,
-                                   pShading->m_pFunctions, pShading->m_nFuncs,
-                                   pShading->m_pCS));
+  if (pShading->m_ShadingType >= kFreeFormGouraudTriangleMeshShading) {

[Tom Sepez, 2015/10/27 00:43:16]

Really dislike >= comparisions with enums, can we make a helper function that
tests if its one of the N cases that require this?

[dsinclair, 2015/10/27 02:11:30]

Done.

+    bbox.Intersect(GetShadingBBox(ToStream(pShading->m_pShadingObj),
+                                  pShading->m_ShadingType, &pObj->m_Matrix,
+                                  pShading->m_pFunctions, pShading->m_nFuncs,
+                                  pShading->m_pCS));
   }
   pObj->m_Left = bbox.left;
   pObj->m_Right = bbox.right;
   pObj->m_Top = bbox.top;
   pObj->m_Bottom = bbox.bottom;
   m_pObjectList->m_ObjectList.AddTail(pObj);
 }
 void CPDF_StreamContentParser::Handle_SetCharSpace() {
   m_pCurStates->m_TextState.GetModify()->m_CharSpace = GetNumber(0);
 }
@@ skipping 418 matching lines @@
         buf.AppendChar((char)code);
       }
       bFirst = !bFirst;
     }
   }
   if (!bFirst) {
     buf.AppendChar((char)code);
   }
   return buf.GetByteString();
 }