Make CPDF_Stream() take unique_ptr's to its dictionary.

fpdfsdk/fpdf_flatten.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 "public/fpdf_flatten.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 160 matching lines @@
   rcRet.top = GetMinMaxValue(*pRectArray, MAX, TOP);
   rcRet.right = GetMinMaxValue(*pRectArray, MAX, RIGHT);
   rcRet.bottom = GetMinMaxValue(*pRectArray, MIN, BOTTOM);
 
   return rcRet;
 }
 
 uint32_t NewIndirectContentsStream(const CFX_ByteString& key,
                                    CPDF_Document* pDocument) {
   CPDF_Stream* pNewContents = pDocument->NewIndirect<CPDF_Stream>(
-      nullptr, 0, new CPDF_Dictionary(pDocument->GetByteStringPool()));
+      nullptr, 0,
+      pdfium::MakeUnique<CPDF_Dictionary>(pDocument->GetByteStringPool()));
   CFX_ByteString sStream;
   sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", key.c_str());
   pNewContents->SetData(sStream.raw_str(), sStream.GetLength());
   return pNewContents->GetObjNum();
 }
 
 void SetPageContents(const CFX_ByteString& key,
                      CPDF_Dictionary* pPage,
                      CPDF_Document* pDocument) {
   CPDF_Array* pContentsArray = nullptr;
@@ skipping 97 matching lines @@
     pCropBox->AddNew<CPDF_Number>(rcOriginalCB.bottom);
     pCropBox->AddNew<CPDF_Number>(rcOriginalCB.right);
     pCropBox->AddNew<CPDF_Number>(rcOriginalCB.top);
   }
 
   CPDF_Dictionary* pRes = pPageDict->GetDictFor("Resources");
   if (!pRes)
     pRes = pPageDict->SetNewFor<CPDF_Dictionary>("Resources");
 
   CPDF_Stream* pNewXObject = pDocument->NewIndirect<CPDF_Stream>(
-      nullptr, 0, new CPDF_Dictionary(pDocument->GetByteStringPool()));
+      nullptr, 0,
+      pdfium::MakeUnique<CPDF_Dictionary>(pDocument->GetByteStringPool()));
 
   uint32_t dwObjNum = pNewXObject->GetObjNum();
   CPDF_Dictionary* pPageXObject = pRes->GetDictFor("XObject");
   if (!pPageXObject)
     pPageXObject = pRes->SetNewFor<CPDF_Dictionary>("XObject");
 
   CFX_ByteString key = "";
   int nStreams = pdfium::CollectionSize<int>(ObjectArray);
   if (nStreams > 0) {
     for (int iKey = 0; /*iKey < 100*/; iKey++) {
@@ skipping 108 matching lines @@
     CFX_ByteString sTemp;
     CFX_Matrix m = GetMatrix(rcAnnot, rcStream, matrix);
     sTemp.Format("q %f 0 0 %f %f %f cm /%s Do Q\n", m.a, m.d, m.e, m.f,
                  sFormName.c_str());
     sStream += sTemp;
     pNewXObject->SetData(sStream.raw_str(), sStream.GetLength());
   }
   pPageDict->RemoveFor("Annots");
   return FLATTEN_SUCCESS;
 }