More unique_ptr returns from DIB methods.

xfa/fxgraphics/cfx_graphics.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 "xfa/fxgraphics/cfx_graphics.h"
 
 #include <memory>
 
@@ skipping 1212 matching lines @@
   m1.Set(m_info.CTM.a, m_info.CTM.b, m_info.CTM.c, m_info.CTM.d, m_info.CTM.e,
          m_info.CTM.f);
   if (matrix) {
     m1.Concat(*matrix);
   }
   CFX_Matrix m2;
   m2.Set((FX_FLOAT)source->GetWidth(), 0.0, 0.0, (FX_FLOAT)source->GetHeight(),
          point.x, point.y);
   m2.Concat(m1);
   int32_t left, top;
-  std::unique_ptr<CFX_DIBitmap> bmp1(source->FlipImage(false, true));
-  std::unique_ptr<CFX_DIBitmap> bmp2(bmp1->TransformTo(&m2, left, top));
+  std::unique_ptr<CFX_DIBitmap> bmp1 = source->FlipImage(false, true);
+  std::unique_ptr<CFX_DIBitmap> bmp2 = bmp1->TransformTo(&m2, left, top);
   CFX_RectF r;
   GetClipRect(r);
   CFX_DIBitmap* bitmap = m_renderDevice->GetBitmap();
   CFX_DIBitmap bmp;
   if (bmp.Create(bitmap->GetWidth(), bitmap->GetHeight(), FXDIB_Argb) &&
       m_renderDevice->GetDIBits(&bmp, 0, 0) &&
       bmp.TransferBitmap(FXSYS_round(r.left), FXSYS_round(r.top),
                          FXSYS_round(r.Width()), FXSYS_round(r.Height()),
                          bmp2.get(), FXSYS_round(r.left - left),
                          FXSYS_round(r.top - top)) &&
       m_renderDevice->SetDIBits(&bmp, 0, 0)) {
     return FWL_Error::Succeeded;
   }
   return FWL_Error::Indefinite;
 }
 
 FWL_Error CFX_Graphics::RenderDeviceStretchImage(CFX_DIBSource* source,
                                                  const CFX_RectF& rect,
                                                  CFX_Matrix* matrix) {
   CFX_Matrix m1;
   m1.Set(m_info.CTM.a, m_info.CTM.b, m_info.CTM.c, m_info.CTM.d, m_info.CTM.e,
          m_info.CTM.f);
   if (matrix) {
     m1.Concat(*matrix);
   }
-  std::unique_ptr<CFX_DIBitmap> bmp1(
-      source->StretchTo((int32_t)rect.Width(), (int32_t)rect.Height()));
+  std::unique_ptr<CFX_DIBitmap> bmp1 =
+      source->StretchTo((int32_t)rect.Width(), (int32_t)rect.Height());
   CFX_Matrix m2;
   m2.Set(rect.Width(), 0.0, 0.0, rect.Height(), rect.left, rect.top);
   m2.Concat(m1);
   int32_t left, top;
-  std::unique_ptr<CFX_DIBitmap> bmp2(bmp1->FlipImage(false, true));
-  std::unique_ptr<CFX_DIBitmap> bmp3(bmp2->TransformTo(&m2, left, top));
+  std::unique_ptr<CFX_DIBitmap> bmp2 = bmp1->FlipImage(false, true);
+  std::unique_ptr<CFX_DIBitmap> bmp3 = bmp2->TransformTo(&m2, left, top);
   CFX_RectF r;
   GetClipRect(r);
   CFX_DIBitmap* bitmap = m_renderDevice->GetBitmap();
   if (bitmap->CompositeBitmap(FXSYS_round(r.left), FXSYS_round(r.top),
                               FXSYS_round(r.Width()), FXSYS_round(r.Height()),
                               bmp3.get(), FXSYS_round(r.left - left),
                               FXSYS_round(r.top - top))) {
     return FWL_Error::Succeeded;
   }
   return FWL_Error::Indefinite;
@@ skipping 202 matching lines @@
 FWL_Error CFX_Graphics::SetDIBitsWithMatrix(CFX_DIBSource* source,
                                             CFX_Matrix* matrix) {
   if (matrix->IsIdentity()) {
     m_renderDevice->SetDIBits(source, 0, 0);
   } else {
     CFX_Matrix m;
     m.Set((FX_FLOAT)source->GetWidth(), 0, 0, (FX_FLOAT)source->GetHeight(), 0,
           0);
     m.Concat(*matrix);
     int32_t left, top;
-    std::unique_ptr<CFX_DIBitmap> bmp1(source->FlipImage(false, true));
-    std::unique_ptr<CFX_DIBitmap> bmp2(bmp1->TransformTo(&m, left, top));
+    std::unique_ptr<CFX_DIBitmap> bmp1 = source->FlipImage(false, true);
+    std::unique_ptr<CFX_DIBitmap> bmp2 = bmp1->TransformTo(&m, left, top);
     m_renderDevice->SetDIBits(bmp2.get(), left, top);
   }
   return FWL_Error::Succeeded;
 }
 
 FWL_Error CFX_Graphics::CalcTextInfo(const CFX_WideString& text,
                                      uint32_t* charCodes,
                                      FXTEXT_CHARPOS* charPos,
                                      CFX_RectF& rect) {
   std::unique_ptr<CFX_UnicodeEncoding> encoding(
@@ skipping 68 matching lines @@
   CTM = other.CTM;
   isActOnDash = other.isActOnDash;
   strokeColor = other.strokeColor;
   fillColor = other.fillColor;
   font = other.font;
   fontSize = other.fontSize;
   fontHScale = other.fontHScale;
   fontSpacing = other.fontSpacing;
   return *this;
 }