More unique_ptr returns from DIB methods.

core/fxge/dib/fx_dib_transform.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/dib/dib_int.h"
 
 #include <memory>
 #include <utility>
@@ skipping 160 matching lines @@
     if (res_x < 0 && res_x > -base) {
       res_x = base + res_x;
     }
     if (res_y < 0 && res_x > -base) {
       res_y = base + res_y;
     }
     x1 /= base;
     y1 /= base;
   }
 };
-CFX_DIBitmap* CFX_DIBSource::SwapXY(bool bXFlip,
-                                    bool bYFlip,
-                                    const FX_RECT* pDestClip) const {
+
+std::unique_ptr<CFX_DIBitmap> CFX_DIBSource::SwapXY(
+    bool bXFlip,
+    bool bYFlip,
+    const FX_RECT* pDestClip) const {
   FX_RECT dest_clip(0, 0, m_Height, m_Width);
-  if (pDestClip) {
+  if (pDestClip)
     dest_clip.Intersect(*pDestClip);
-  }
-  if (dest_clip.IsEmpty()) {
+  if (dest_clip.IsEmpty())
     return nullptr;
-  }
-  CFX_DIBitmap* pTransBitmap = new CFX_DIBitmap;
-  int result_height = dest_clip.Height(), result_width = dest_clip.Width();
-  if (!pTransBitmap->Create(result_width, result_height, GetFormat())) {
-    delete pTransBitmap;
+
+  auto pTransBitmap = pdfium::MakeUnique<CFX_DIBitmap>();
+  int result_height = dest_clip.Height();
+  int result_width = dest_clip.Width();
+  if (!pTransBitmap->Create(result_width, result_height, GetFormat()))
     return nullptr;
-  }
+
   pTransBitmap->SetPalette(m_pPalette.get());
   int dest_pitch = pTransBitmap->GetPitch();
   uint8_t* dest_buf = pTransBitmap->GetBuffer();
   int row_start = bXFlip ? m_Height - dest_clip.right : dest_clip.left;
   int row_end = bXFlip ? m_Height - dest_clip.left : dest_clip.right;
   int col_start = bYFlip ? m_Width - dest_clip.bottom : dest_clip.top;
   int col_end = bYFlip ? m_Width - dest_clip.top : dest_clip.bottom;
   if (GetBPP() == 1) {
     FXSYS_memset(dest_buf, 0xff, dest_pitch * result_height);
     for (int row = row_start; row < row_end; row++) {
@@ skipping 62 matching lines @@
       }
       const uint8_t* src_scan = m_pAlphaMask->GetScanline(row) + col_start;
       for (int col = col_start; col < col_end; col++) {
         *dest_scan = *src_scan++;
         dest_scan += dest_step;
       }
     }
   }
   return pTransBitmap;
 }
+
 #define FIX16_005 0.05f
 FX_RECT FXDIB_SwapClipBox(FX_RECT& clip,
                           int width,
                           int height,
                           bool bFlipX,
                           bool bFlipY) {
   FX_RECT rect;
   if (bFlipY) {
     rect.left = height - clip.top;
     rect.right = height - clip.bottom;
@@ skipping 119 matching lines @@
   m_Status = 3;
   return true;
 }
 
 bool CFX_ImageTransformer::Continue(IFX_Pause* pPause) {
   if (m_Status == 1) {
     if (m_Stretcher->Continue(pPause))
       return true;
 
     if (m_Storer.GetBitmap()) {
-      std::unique_ptr<CFX_DIBitmap> swapped(
+      m_Storer.Replace(
           m_Storer.GetBitmap()->SwapXY(m_pMatrix->c > 0, m_pMatrix->b < 0));
-      m_Storer.Replace(std::move(swapped));
     }
     return false;
   }
 
   if (m_Status == 2)
     return m_Stretcher->Continue(pPause);
 
   if (m_Status != 3)
     return false;
 
@@ skipping 521 matching lines @@
       }
     }
   }
   m_Storer.Replace(std::move(pTransformed));
   return false;
 }
 
 std::unique_ptr<CFX_DIBitmap> CFX_ImageTransformer::DetachBitmap() {
   return m_Storer.Detach();
 }