Merge to XFA: Use override in more classes in core/

core/src/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 <limits.h>
 
 #include "../../../include/fpdfapi/fpdf_module.h"
 #include "../../../include/fpdfapi/fpdf_page.h"
@@ skipping 445 matching lines @@
     if (pData[(bitpos + i) / 8] & (1 << (7 - (bitpos + i) % 8))) {
       result |= 1 << (nbits - i - 1);
     }
   return result;
 }
 typedef struct {
   FX_FLOAT encode_max, encode_min;
   int sizes;
 } SampleEncodeInfo;
 typedef struct { FX_FLOAT decode_max, decode_min; } SampleDecodeInfo;
+
 class CPDF_SampledFunc : public CPDF_Function {
  public:
   CPDF_SampledFunc();
-  virtual ~CPDF_SampledFunc();
-  virtual FX_BOOL v_Init(CPDF_Object* pObj);
-  virtual FX_BOOL v_Call(FX_FLOAT* inputs, FX_FLOAT* results) const;
+  ~CPDF_SampledFunc() override;
+
+  // CPDF_Function
+  FX_BOOL v_Init(CPDF_Object* pObj) override;
+  FX_BOOL v_Call(FX_FLOAT* inputs, FX_FLOAT* results) const override;
+
   SampleEncodeInfo* m_pEncodeInfo;
   SampleDecodeInfo* m_pDecodeInfo;
   FX_DWORD m_nBitsPerSample;
   FX_DWORD m_SampleMax;
   CPDF_StreamAcc* m_pSampleStream;
 };
+
 CPDF_SampledFunc::CPDF_SampledFunc() {
   m_pSampleStream = NULL;
   m_pEncodeInfo = NULL;
   m_pDecodeInfo = NULL;
 }
 CPDF_SampledFunc::~CPDF_SampledFunc() {
   delete m_pSampleStream;
   if (m_pEncodeInfo) {
     FX_Free(m_pEncodeInfo);
   }
@@ skipping 125 matching lines @@
         encoded += (encoded_input[i] - index[i]) *
                    ((FX_FLOAT)sample1 - (FX_FLOAT)sample);
       }
     }
     results[j] = PDF_Interpolate(encoded, 0, (FX_FLOAT)m_SampleMax,
                                  m_pDecodeInfo[j].decode_min,
                                  m_pDecodeInfo[j].decode_max);
   }
   return TRUE;
 }
+
 class CPDF_PSFunc : public CPDF_Function {
  public:
-  virtual FX_BOOL v_Init(CPDF_Object* pObj);
-  virtual FX_BOOL v_Call(FX_FLOAT* inputs, FX_FLOAT* results) const;
+  // CPDF_Function
+  FX_BOOL v_Init(CPDF_Object* pObj) override;
+  FX_BOOL v_Call(FX_FLOAT* inputs, FX_FLOAT* results) const override;
+
   CPDF_PSEngine m_PS;
 };
+
 FX_BOOL CPDF_PSFunc::v_Init(CPDF_Object* pObj) {
   CPDF_Stream* pStream = (CPDF_Stream*)pObj;
   CPDF_StreamAcc acc;
   acc.LoadAllData(pStream, FALSE);
   return m_PS.Parse((const FX_CHAR*)acc.GetData(), acc.GetSize());
 }
 FX_BOOL CPDF_PSFunc::v_Call(FX_FLOAT* inputs, FX_FLOAT* results) const {
   CPDF_PSEngine& PS = (CPDF_PSEngine&)m_PS;
   PS.Reset();
   int i;
   for (i = 0; i < m_nInputs; i++) {
     PS.Push(inputs[i]);
   }
   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();
-  virtual ~CPDF_ExpIntFunc();
-  virtual FX_BOOL v_Init(CPDF_Object* pObj);
-  virtual FX_BOOL v_Call(FX_FLOAT* inputs, FX_FLOAT* results) const;
+  ~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;
 };
+
 CPDF_ExpIntFunc::CPDF_ExpIntFunc() {
   m_pBeginValues = NULL;
   m_pEndValues = NULL;
 }
 CPDF_ExpIntFunc::~CPDF_ExpIntFunc() {
   if (m_pBeginValues) {
     FX_Free(m_pBeginValues);
   }
   if (m_pEndValues) {
     FX_Free(m_pEndValues);
@@ skipping 29 matching lines @@
 FX_BOOL CPDF_ExpIntFunc::v_Call(FX_FLOAT* inputs, FX_FLOAT* results) const {
   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();
-  virtual ~CPDF_StitchFunc();
-  virtual FX_BOOL v_Init(CPDF_Object* pObj);
-  virtual FX_BOOL v_Call(FX_FLOAT* inputs, FX_FLOAT* results) const;
+  ~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;
+
   int m_nSubs;
   CPDF_Function** m_pSubFunctions;
   FX_FLOAT* m_pBounds;
   FX_FLOAT* m_pEncode;
 };
+
 CPDF_StitchFunc::CPDF_StitchFunc() {
   m_nSubs = 0;
   m_pSubFunctions = NULL;
   m_pBounds = NULL;
   m_pEncode = NULL;
 }
 CPDF_StitchFunc::~CPDF_StitchFunc() {
   for (int i = 0; i < m_nSubs; i++)
     delete m_pSubFunctions[i];
   if (m_pSubFunctions) {
@@ skipping 178 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;
 }