support gradients and stroke+fill

core/fpdfapi/fpdf_page/fpdf_page_func.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 "core/fpdfapi/fpdf_page/pageint.h"
 
 #include <limits.h>
 
@@ skipping 676 matching lines @@
   PS.Execute();
   if (PS.GetStackSize() < m_nOutputs) {
     return FALSE;
   }
   for (i = 0; i < m_nOutputs; i++) {
     results[m_nOutputs - i - 1] = PS.Pop();
   }
   return TRUE;
 }
 
-class CPDF_ExpIntFunc : public CPDF_Function {
- public:
-  CPDF_ExpIntFunc();
-  ~CPDF_ExpIntFunc() override;
-
-  // CPDF_Function
-  FX_BOOL v_Init(CPDF_Object* pObj) override;
-  FX_BOOL v_Call(FX_FLOAT* inputs, FX_FLOAT* results) const override;
-
-  FX_FLOAT m_Exponent;
-  FX_FLOAT* m_pBeginValues;
-  FX_FLOAT* m_pEndValues;
-  int m_nOrigOutputs;
-};
+}  // namespace
 
 CPDF_ExpIntFunc::CPDF_ExpIntFunc() {
   m_pBeginValues = NULL;
   m_pEndValues = NULL;
 }
 CPDF_ExpIntFunc::~CPDF_ExpIntFunc() {
   FX_Free(m_pBeginValues);
   FX_Free(m_pEndValues);
 }
 FX_BOOL CPDF_ExpIntFunc::v_Init(CPDF_Object* pObj) {
@@ skipping 27 matching lines @@
   for (int i = 0; i < m_nInputs; i++)
     for (int j = 0; j < m_nOrigOutputs; j++) {
       results[i * m_nOrigOutputs + j] =
           m_pBeginValues[j] +
           (FX_FLOAT)FXSYS_pow(inputs[i], m_Exponent) *
               (m_pEndValues[j] - m_pBeginValues[j]);
     }
   return TRUE;
 }
 
-class CPDF_StitchFunc : public CPDF_Function {
- public:
-  CPDF_StitchFunc();
-  ~CPDF_StitchFunc() override;
-
-  // CPDF_Function
-  FX_BOOL v_Init(CPDF_Object* pObj) override;
-  FX_BOOL v_Call(FX_FLOAT* inputs, FX_FLOAT* results) const override;
-
-  std::vector<CPDF_Function*> m_pSubFunctions;
-  FX_FLOAT* m_pBounds;
-  FX_FLOAT* m_pEncode;
-
-  static const int kRequiredNumInputs = 1;
-};
-
 CPDF_StitchFunc::CPDF_StitchFunc() {
   m_pBounds = NULL;
   m_pEncode = NULL;
 }
 CPDF_StitchFunc::~CPDF_StitchFunc() {
   for (auto& sub : m_pSubFunctions) {
     delete sub;
   }
   FX_Free(m_pBounds);
   FX_Free(m_pEncode);
@@ skipping 68 matching lines @@
   if (!m_pSubFunctions[i]) {
     return FALSE;
   }
   input = PDF_Interpolate(input, m_pBounds[i], m_pBounds[i + 1],
                           m_pEncode[i * 2], m_pEncode[i * 2 + 1]);
   int nresults;
   m_pSubFunctions[i]->Call(&input, kRequiredNumInputs, outputs, nresults);
   return TRUE;
 }
 
-}  // namespace
-
 CPDF_Function* CPDF_Function::Load(CPDF_Object* pFuncObj) {
   if (!pFuncObj) {
     return NULL;
   }
   CPDF_Function* pFunc = NULL;

[Tom Sepez, 2016/03/24 18:07:07]

nit: move to line 846?

[caryclark, 2016/03/25 20:47:55]

Done.

   int type;
   if (CPDF_Stream* pStream = pFuncObj->AsStream()) {
     type = pStream->GetDict()->GetIntegerBy("FunctionType");
   } else if (CPDF_Dictionary* pDict = pFuncObj->AsDictionary()) {
     type = pDict->GetIntegerBy("FunctionType");
   } else {
     return NULL;
   }
   if (type == 0) {
     pFunc = new CPDF_SampledFunc;
   } else if (type == 2) {
     pFunc = new CPDF_ExpIntFunc;
   } else if (type == 3) {
     pFunc = new CPDF_StitchFunc;
   } else if (type == 4) {
     pFunc = new CPDF_PSFunc;
   } else {
     return NULL;
   }
   if (!pFunc->Init(pFuncObj)) {
     delete pFunc;
     return NULL;
   }
+  pFunc->m_nType = type;

[Tom Sepez, 2016/03/24 18:07:07]

Shouldn't the ctors of the various function sub-classes be setting this?

[caryclark, 2016/03/25 20:47:55]

Done.

   return pFunc;
 }
 CPDF_Function::CPDF_Function() {
   m_pDomains = NULL;
   m_pRanges = NULL;
 }
 CPDF_Function::~CPDF_Function() {
   FX_Free(m_pDomains);
   FX_Free(m_pRanges);
 }
@@ skipping 55 matching lines @@
     for (int i = 0; i < m_nOutputs; i++) {
       if (results[i] < m_pRanges[i * 2]) {
         results[i] = m_pRanges[i * 2];
       } else if (results[i] > m_pRanges[i * 2 + 1]) {
         results[i] = m_pRanges[i * 2 + 1];
       }
     }
   }
   return TRUE;
 }