Merge 3 CLs to M53.

core/fxge/dib/dib_int.h

 // 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
 
 #ifndef CORE_FXGE_DIB_DIB_INT_H_
 #define CORE_FXGE_DIB_DIB_INT_H_
 
 #include <stdint.h>
@@ skipping 22 matching lines @@
   }
   int a, b, c, d, e, f;
   int base;
 };
 #define FPDF_HUGE_IMAGE_SIZE 60000000
 struct PixelWeight {
   int m_SrcStart;
   int m_SrcEnd;
   int m_Weights[1];
 };
+
 class CWeightTable {
  public:
-  CWeightTable() { m_pWeightTables = nullptr; }
-  ~CWeightTable() {
-    FX_Free(m_pWeightTables);
-    m_pWeightTables = nullptr;
-  }
-  void Calc(int dest_len,
+  CWeightTable();
+  ~CWeightTable();
+
+  bool Calc(int dest_len,
             int dest_min,
             int dest_max,
             int src_len,
             int src_min,
             int src_max,
             int flags);
-  PixelWeight* GetPixelWeight(int pixel) {
-    return (PixelWeight*)(m_pWeightTables + (pixel - m_DestMin) * m_ItemSize);
-  }
-  int m_DestMin, m_ItemSize;
+  PixelWeight* GetPixelWeight(int pixel) const;
+  int* GetValueFromPixelWeight(PixelWeight* pWeight, int index) const;
+
+ private:
+  int m_DestMin;
+  int m_ItemSize;
   uint8_t* m_pWeightTables;
+  size_t m_dwWeightTablesSize;
 };
 class CStretchEngine {
  public:
   CStretchEngine(IFX_ScanlineComposer* pDestBitmap,
                  FXDIB_Format dest_format,
                  int dest_width,
                  int dest_height,
                  const FX_RECT& clip_rect,
                  const CFX_DIBSource* pSrcBitmap,
                  int flags);
@@ skipping 26 matching lines @@
   int m_State;
 };
 
 FX_RECT FXDIB_SwapClipBox(FX_RECT& clip,
                           int width,
                           int height,
                           FX_BOOL bFlipX,
                           FX_BOOL bFlipY);
 
 #endif  // CORE_FXGE_DIB_DIB_INT_H_