Return unique_ptrs from CFX_DIBitmap::Clone().

core/fxge/win32/fx_win32_gdipext.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 <windows.h>
 
 #include <algorithm>
 
@@ skipping 540 matching lines @@
       abs(dest_height) < src_height) {
     FX_RECT image_rect(dest_left, dest_top, dest_left + dest_width,
                        dest_top + dest_height);
     image_rect.Normalize();
     FX_RECT image_clip = image_rect;
     image_clip.Intersect(*pClipRect);
     if (image_clip.IsEmpty()) {
       return;
     }
     image_clip.Offset(-image_rect.left, -image_rect.top);
     CFX_DIBitmap* pStretched = nullptr;

[dsinclair, 2016/12/05 20:41:26]

unique_ptr?

     if (src_width * src_height > 10000) {
       pStretched =
           _StretchMonoToGray(dest_width, dest_height, pBitmap, &image_clip);

[dsinclair, 2016/12/05 20:41:26]

Drop the _ from the method name

[Tom Sepez, 2016/12/05 21:38:13]

Done.

     } else {
       pStretched =
-          pBitmap->StretchTo(dest_width, dest_height, false, &image_clip);
+          pBitmap->StretchTo(dest_width, dest_height, false, &image_clip)
+              .release();
     }
     GpBitmap* bitmap;
     CallFunc(GdipCreateBitmapFromScan0)(image_clip.Width(), image_clip.Height(),
                                         (image_clip.Width() + 3) / 4 * 4,
                                         PixelFormat8bppIndexed,
                                         pStretched->GetBuffer(), &bitmap);
     int a, r, g, b;
     ArgbDecode(argb, a, r, g, b);
     UINT pal[258];
     pal[0] = 0;
@@ skipping 25 matching lines @@
                         const FX_RECT* pSrcRect,
                         int dest_left,
                         int dest_top,
                         int dest_width,
                         int dest_height) {
   int src_width = pSrcRect->Width(), src_height = pSrcRect->Height();
   CGdiplusExt& GdiplusExt =
       ((CWin32Platform*)CFX_GEModule::Get()->GetPlatformData())->m_GdiplusExt;
   if (pBitmap->GetBPP() == 1 && (pSrcRect->left % 8)) {
     FX_RECT new_rect(0, 0, src_width, src_height);
-    CFX_DIBitmap* pCloned = pBitmap->Clone(pSrcRect);
+    CFX_DIBitmap* pCloned = pBitmap->Clone(pSrcRect).release();

[dsinclair, 2016/12/05 20:41:26]

unique_ptr?

     if (!pCloned) {

[npm, 2016/12/05 20:37:23]

Nit: no {}

       return;
     }
     OutputImage(pGraphics, pCloned, &new_rect, dest_left, dest_top, dest_width,
                 dest_height);
     delete pCloned;
     return;
   }
   int src_pitch = pBitmap->GetPitch();
   uint8_t* scan0 = pBitmap->GetBuffer() + pSrcRect->top * src_pitch +
                    pBitmap->GetBPP() * pSrcRect->left / 8;
@@ skipping 889 matching lines @@
       FXSYS_memcpy(pData + dest_pitch * i, pInfo->pScan0 + pInfo->Stride * i,
                    dest_pitch);
     }
   }
   CFX_DIBitmap* pDIBitmap = _FX_WindowsDIB_LoadFromBuf(
       pInfo->pbmi, pData, pInfo->pbmi->bmiHeader.biBitCount == 32);
   FX_Free(pData);
   FreeDIBitmap(pInfo);
   return pDIBitmap;
 }