Use smart pointers for graphics device classes

core/fxge/dib/fx_dib_main.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/fxge/include/fx_dib.h"
 
+#include <limits.h>
 #include <algorithm>
-#include <limits.h>
 
 #include "core/fxcodec/include/fx_codec.h"
 #include "core/fxge/dib/dib_int.h"
 #include "core/fxge/include/fx_ge.h"
 
 void CmykDecode(uint32_t cmyk, int& c, int& m, int& y, int& k) {
   c = FXSYS_GetCValue(cmyk);
   m = FXSYS_GetMValue(cmyk);
   y = FXSYS_GetYValue(cmyk);
   k = FXSYS_GetKValue(cmyk);
@@ skipping 1431 matching lines @@
         *dest_scan = *src_scan;
         dest_scan--;
         src_scan++;
       }
     }
   }
   return pFlipped;
 }
 
 CFX_DIBExtractor::CFX_DIBExtractor(const CFX_DIBSource* pSrc) {
-  m_pBitmap = nullptr;
   if (pSrc->GetBuffer()) {
-    m_pBitmap = new CFX_DIBitmap;
+    m_pBitmap.reset(new CFX_DIBitmap);
     if (!m_pBitmap->Create(pSrc->GetWidth(), pSrc->GetHeight(),
                            pSrc->GetFormat(), pSrc->GetBuffer())) {
-      delete m_pBitmap;
-      m_pBitmap = nullptr;
+      m_pBitmap.reset();
       return;
     }
     m_pBitmap->CopyPalette(pSrc->GetPalette());
     m_pBitmap->CopyAlphaMask(pSrc->m_pAlphaMask);
   } else {
-    m_pBitmap = pSrc->Clone();
+    m_pBitmap.reset(pSrc->Clone());
   }
 }
 
-CFX_DIBExtractor::~CFX_DIBExtractor() {
-  delete m_pBitmap;
-}
+CFX_DIBExtractor::~CFX_DIBExtractor() {}
 
-CFX_FilteredDIB::CFX_FilteredDIB() {
-  m_pScanline = nullptr;
-  m_pSrc = nullptr;
-}
+CFX_FilteredDIB::CFX_FilteredDIB() : m_pSrc(nullptr) {}
 
 CFX_FilteredDIB::~CFX_FilteredDIB() {
   if (m_bAutoDropSrc) {
     delete m_pSrc;
   }
-  FX_Free(m_pScanline);
 }
 
 void CFX_FilteredDIB::LoadSrc(const CFX_DIBSource* pSrc, FX_BOOL bAutoDropSrc) {
   m_pSrc = pSrc;
   m_bAutoDropSrc = bAutoDropSrc;
   m_Width = pSrc->GetWidth();
   m_Height = pSrc->GetHeight();
   FXDIB_Format format = GetDestFormat();
   m_bpp = (uint8_t)format;
   m_AlphaFlag = (uint8_t)(format >> 8);
   m_Pitch = (m_Width * (format & 0xff) + 31) / 32 * 4;
   m_pPalette.reset(GetDestPalette());
-  m_pScanline = FX_Alloc(uint8_t, m_Pitch);
+  m_pScanline.resize(m_Pitch);
 }
 
 const uint8_t* CFX_FilteredDIB::GetScanline(int line) const {
-  TranslateScanline(m_pScanline, m_pSrc->GetScanline(line));
-  return m_pScanline;
+  TranslateScanline(&m_pScanline, m_pSrc->GetScanline(line));
+  return &m_pScanline[0];

[Lei Zhang, 2016/07/20 23:09:19]

Can we return m_pScanline.data() ?

[Wei Li, 2016/07/21 16:47:07]

Done.

 }
 
 void CFX_FilteredDIB::DownSampleScanline(int line,
                                          uint8_t* dest_scan,
                                          int dest_bpp,
                                          int dest_width,
                                          FX_BOOL bFlipX,
                                          int clip_left,
                                          int clip_width) const {
   m_pSrc->DownSampleScanline(line, dest_scan, dest_bpp, dest_width, bFlipX,
                              clip_left, clip_width);
   TranslateDownSamples(dest_scan, dest_scan, clip_width, dest_bpp);
 }
 
 CFX_ImageRenderer::CFX_ImageRenderer() {
   m_Status = 0;
-  m_pTransformer = nullptr;
   m_bRgbByteOrder = FALSE;
   m_BlendType = FXDIB_BLEND_NORMAL;
 }
 
-CFX_ImageRenderer::~CFX_ImageRenderer() {
-  delete m_pTransformer;
-}
+CFX_ImageRenderer::~CFX_ImageRenderer() {}
 
 FX_BOOL CFX_ImageRenderer::Start(CFX_DIBitmap* pDevice,
                                  const CFX_ClipRgn* pClipRgn,
                                  const CFX_DIBSource* pSource,
                                  int bitmap_alpha,
                                  uint32_t mask_color,
                                  const CFX_Matrix* pMatrix,
                                  uint32_t dib_flags,
                                  FX_BOOL bRgbByteOrder,
                                  int alpha_flag,
@@ skipping 36 matching lines @@
       m_Stretcher.reset(new CFX_ImageStretcher(&m_Composer, pSource,
                                                dest_height, dest_width,
                                                bitmap_clip, dib_flags));
       if (!m_Stretcher->Start())
         return FALSE;
 
       m_Status = 1;
       return TRUE;
     }
     m_Status = 2;
-    m_pTransformer =
-        new CFX_ImageTransformer(pSource, &m_Matrix, dib_flags, &m_ClipBox);
+    m_pTransformer.reset(
+        new CFX_ImageTransformer(pSource, &m_Matrix, dib_flags, &m_ClipBox));
     m_pTransformer->Start();
     return TRUE;
   }
 
   int dest_width = image_rect.Width();
   if (m_Matrix.a < 0)
     dest_width = -dest_width;
 
   int dest_height = image_rect.Height();
   if (m_Matrix.d > 0)
@@ skipping 90 matching lines @@
                                   uint32_t* pSrcPalette) {
   m_pBitmap.reset(new CFX_DIBitmap);
   if (!m_pBitmap->Create(width, height, src_format)) {
     m_pBitmap.reset();
     return FALSE;
   }
   if (pSrcPalette)
     m_pBitmap->CopyPalette(pSrcPalette);
   return TRUE;
 }