Remove CPDF_Object::Release() in favor of direct delete

core/fpdfapi/page/cpdf_image.cpp

 // Copyright 2016 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/fpdfapi/page/cpdf_image.h"
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/page/cpdf_docpagedata.h"
 #include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fpdfapi/parser/cpdf_array.h"
 #include "core/fpdfapi/parser/cpdf_boolean.h"
 #include "core/fpdfapi/parser/cpdf_dictionary.h"
 #include "core/fpdfapi/parser/cpdf_document.h"
 #include "core/fpdfapi/parser/cpdf_string.h"
 #include "core/fpdfapi/render/cpdf_pagerendercache.h"
 #include "core/fpdfapi/render/render_int.h"
 #include "core/fxcodec/fx_codec.h"
 #include "core/fxge/fx_dib.h"
 
 CPDF_Image::CPDF_Image(CPDF_Document* pDoc) : m_pDocument(pDoc) {}
 
-CPDF_Image::CPDF_Image(CPDF_Document* pDoc, UniqueStream pStream)
+CPDF_Image::CPDF_Image(CPDF_Document* pDoc,
+                       std::unique_ptr<CPDF_Stream> pStream)
     : m_pDocument(pDoc),
       m_pStream(pStream.get()),
       m_pOwnedStream(std::move(pStream)) {
   if (!m_pStream)
     return;
 
-  m_pOwnedDict = ToDictionary(UniqueObject(m_pStream->GetDict()->Clone()));
+  m_pOwnedDict =
+      ToDictionary(std::unique_ptr<CPDF_Object>(m_pStream->GetDict()->Clone()));
   m_pDict = m_pOwnedDict.get();
   FinishInitialization();
 }
 
 CPDF_Image::CPDF_Image(CPDF_Document* pDoc, uint32_t dwStreamObjNum)
     : m_pDocument(pDoc),
       m_pStream(ToStream(pDoc->GetIndirectObject(dwStreamObjNum))) {
   if (!m_pStream)
     return;
 
   m_pDict = m_pStream->GetDict();
   FinishInitialization();
 }
 
 CPDF_Image::~CPDF_Image() {}
 
 void CPDF_Image::FinishInitialization() {
   m_pOC = m_pDict->GetDictFor("OC");
   m_bIsMask =
       !m_pDict->KeyExist("ColorSpace") || m_pDict->GetIntegerFor("ImageMask");
   m_bInterpolate = !!m_pDict->GetIntegerFor("Interpolate");
   m_Height = m_pDict->GetIntegerFor("Height");
   m_Width = m_pDict->GetIntegerFor("Width");
 }
 
 CPDF_Image* CPDF_Image::Clone() {
   CPDF_Image* pImage = new CPDF_Image(m_pDocument);
   if (m_pOwnedStream) {
-    pImage->m_pOwnedStream = ToStream(UniqueObject(m_pOwnedStream->Clone()));
+    pImage->m_pOwnedStream =
+        ToStream(std::unique_ptr<CPDF_Object>(m_pOwnedStream->Clone()));
     pImage->m_pStream = pImage->m_pOwnedStream.get();
   } else {
     pImage->m_pStream = m_pStream;
   }
   if (m_pOwnedDict) {
-    pImage->m_pOwnedDict = ToDictionary(UniqueObject(m_pOwnedDict->Clone()));
+    pImage->m_pOwnedDict =
+        ToDictionary(std::unique_ptr<CPDF_Object>(m_pOwnedDict->Clone()));
     pImage->m_pDict = pImage->m_pOwnedDict.get();
   } else {
     pImage->m_pDict = m_pDict;
   }
   return pImage;
 }
 
 CPDF_Dictionary* CPDF_Image::InitJPEG(uint8_t* pData, uint32_t size) {
   int32_t width;
   int32_t height;
@@ skipping 201 matching lines @@
   }
   if (opType == 0) {
     if (iCompress & PDF_IMAGE_LOSSLESS_COMPRESS) {
     } else {
       if (pBitmap->GetBPP() == 1) {
       } else if (pBitmap->GetBPP() >= 8 && pBitmap->GetPalette()) {
         CFX_DIBitmap* pNewBitmap = new CFX_DIBitmap();
         pNewBitmap->Copy(pBitmap);
         pNewBitmap->ConvertFormat(FXDIB_Rgb);
         SetImage(pNewBitmap, iCompress);
-        if (pDict) {
-          pDict->Release();
-          pDict = nullptr;
-        }
+        delete pDict;
+        pDict = nullptr;
         FX_Free(dest_buf);
         dest_buf = nullptr;
         dest_size = 0;
         delete pNewBitmap;
         return;
       }
     }
   } else if (opType == 1) {
     dest_buf = FX_Alloc2D(uint8_t, dest_pitch, BitmapHeight);
     dest_size = dest_pitch * BitmapHeight;  // Safe as checked alloc returned.
@@ skipping 97 matching lines @@
   }
   if (!ret) {
     delete m_pDIBSource;
     m_pDIBSource = nullptr;
     return false;
   }
   m_pMask = pSource->DetachMask();
   m_MatteColor = pSource->GetMatteColor();
   return false;
 }