Clean up fx_codec_tiff.cpp.

core/fxcodec/codec/include/ccodec_progressivedecoder.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_FXCODEC_CODEC_INCLUDE_CCODEC_PROGRESSIVEDECODER_H_
 #define CORE_FXCODEC_CODEC_INCLUDE_CCODEC_PROGRESSIVEDECODER_H_
 
+#include <vector>
+
 #include "core/fxcodec/include/fx_codec_def.h"
 #include "core/fxcrt/include/fx_system.h"
 #include "core/fxge/include/fx_dib.h"
 
 class CCodec_BmpModule;
 class CCodec_GifContext;
 class CCodec_GifModule;
 class CCodec_JpegModule;
 class CCodec_ModuleMgr;
 class CCodec_PngContext;
@@ skipping 13 matching lines @@
     FXCodec_1bppGray = 0x101,
     FXCodec_1bppRgb = 0x001,
     FXCodec_8bppGray = 0x108,
     FXCodec_8bppRgb = 0x008,
     FXCodec_Rgb = 0x018,
     FXCodec_Rgb32 = 0x020,
     FXCodec_Argb = 0x220,
     FXCodec_Cmyk = 0x120
   };
 
-  CCodec_ProgressiveDecoder(CCodec_ModuleMgr* pCodecMgr);
+  explicit CCodec_ProgressiveDecoder(CCodec_ModuleMgr* pCodecMgr);
   ~CCodec_ProgressiveDecoder();
 
   FXCODEC_STATUS LoadImageInfo(IFX_FileRead* pFile,
                                FXCODEC_IMAGE_TYPE imageType,
                                CFX_DIBAttribute* pAttribute);
 
   FXCODEC_IMAGE_TYPE GetType() const { return m_imagType; }
   int32_t GetWidth() const { return m_SrcWidth; }
   int32_t GetHeight() const { return m_SrcHeight; }
   int32_t GetNumComponents() const { return m_SrcComponents; }
@@ skipping 12 matching lines @@
   FXCODEC_STATUS ContinueDecode(IFX_Pause* pPause = nullptr);
 
   struct PixelWeight {
     int m_SrcStart;
     int m_SrcEnd;
     int m_Weights[1];
   };
 
   class CFXCODEC_WeightTable {
    public:
-    CFXCODEC_WeightTable() { m_pWeightTables = nullptr; }
-    ~CFXCODEC_WeightTable() { FX_Free(m_pWeightTables); }
+    CFXCODEC_WeightTable() {}
+    ~CFXCODEC_WeightTable() {}
 
     void Calc(int dest_len,
               int dest_min,
               int dest_max,
               int src_len,
               int src_min,
               int src_max,
               FX_BOOL bInterpol);
     PixelWeight* GetPixelWeight(int pixel) {
-      return (PixelWeight*)(m_pWeightTables + (pixel - m_DestMin) * m_ItemSize);
+      return reinterpret_cast<PixelWeight*>(m_pWeightTables.data() +
+                                            (pixel - m_DestMin) * m_ItemSize);
     }
 
-    int m_DestMin, m_ItemSize;
-    uint8_t* m_pWeightTables;
+    int m_DestMin;
+    int m_ItemSize;
+    std::vector<uint8_t> m_pWeightTables;
   };
 
   class CFXCODEC_HorzTable {
    public:
-    CFXCODEC_HorzTable() { m_pWeightTables = nullptr; }
-    ~CFXCODEC_HorzTable() { FX_Free(m_pWeightTables); }
+    CFXCODEC_HorzTable() {}
+    ~CFXCODEC_HorzTable() {}
 
     void Calc(int dest_len, int src_len, FX_BOOL bInterpol);
     PixelWeight* GetPixelWeight(int pixel) {
-      return (PixelWeight*)(m_pWeightTables + pixel * m_ItemSize);
+      return reinterpret_cast<PixelWeight*>(m_pWeightTables.data() +
+                                            pixel * m_ItemSize);
     }
 
     int m_ItemSize;
-    uint8_t* m_pWeightTables;
+    std::vector<uint8_t> m_pWeightTables;
   };
 
   class CFXCODEC_VertTable {
    public:
-    CFXCODEC_VertTable() { m_pWeightTables = nullptr; }
-    ~CFXCODEC_VertTable() { FX_Free(m_pWeightTables); }
+    CFXCODEC_VertTable() {}
+    ~CFXCODEC_VertTable() {}
     void Calc(int dest_len, int src_len);
     PixelWeight* GetPixelWeight(int pixel) {
-      return (PixelWeight*)(m_pWeightTables + pixel * m_ItemSize);
+      return reinterpret_cast<PixelWeight*>(m_pWeightTables.data() +
+                                            pixel * m_ItemSize);
     }
     int m_ItemSize;
-    uint8_t* m_pWeightTables;
+    std::vector<uint8_t> m_pWeightTables;
   };
 
   IFX_FileRead* m_pFile;
   CCodec_ModuleMgr* m_pCodecMgr;
   FXJPEG_Context* m_pJpegContext;
   FXPNG_Context* m_pPngContext;
   FXGIF_Context* m_pGifContext;
   FXBMP_Context* m_pBmpContext;
   CCodec_TiffContext* m_pTiffContext;
   FXCODEC_IMAGE_TYPE m_imagType;
@@ skipping 93 matching lines @@
                           FXCODEC_STATUS& err_status);
   void GifDoubleLineResampleVert(CFX_DIBitmap* pDeviceBitmap,
                                  double scale_y,
                                  int des_row);
   FX_BOOL BmpReadMoreData(CCodec_BmpModule* pBmpModule,
                           FXCODEC_STATUS& err_status);
   void ResampleVertBT(CFX_DIBitmap* pDeviceBitmap, double scale_y, int des_row);
 };
 
 #endif  // CORE_FXCODEC_CODEC_INCLUDE_CCODEC_PROGRESSIVEDECODER_H_