diff options
author | tsepez <tsepez@chromium.org> | 2016-11-09 13:28:26 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-11-09 13:28:26 -0800 |
commit | 335cf093231c984a23cb9ea113148ea1f19621ba (patch) | |
tree | e9c7803b0ce71269beb3d423549a2d6a0ac7784a /core/fpdfapi/parser/cpdf_stream.cpp | |
parent | 3ff4deea307c38462393e4f83dabe32949338168 (diff) | |
download | pdfium-335cf093231c984a23cb9ea113148ea1f19621ba.tar.xz |
Return unique_ptr from CPDF_Object::Clone().
Because that's what clone does. There are numerous
release() calls that will go away as more code is
converted.
Review-Url: https://codereview.chromium.org/2484033002
Diffstat (limited to 'core/fpdfapi/parser/cpdf_stream.cpp')
-rw-r--r-- | core/fpdfapi/parser/cpdf_stream.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/fpdfapi/parser/cpdf_stream.cpp b/core/fpdfapi/parser/cpdf_stream.cpp index 11ef1d2dc1..e8ee022940 100644 --- a/core/fpdfapi/parser/cpdf_stream.cpp +++ b/core/fpdfapi/parser/cpdf_stream.cpp @@ -68,11 +68,11 @@ void CPDF_Stream::InitStreamFromFile(IFX_SeekableReadStream* pFile, m_pDict->SetIntegerFor("Length", m_dwSize); } -CPDF_Object* CPDF_Stream::Clone() const { +std::unique_ptr<CPDF_Object> CPDF_Stream::Clone() const { return CloneObjectNonCyclic(false); } -CPDF_Object* CPDF_Stream::CloneNonCyclic( +std::unique_ptr<CPDF_Object> CPDF_Stream::CloneNonCyclic( bool bDirect, std::set<const CPDF_Object*>* pVisited) const { pVisited->insert(this); @@ -81,11 +81,11 @@ CPDF_Object* CPDF_Stream::CloneNonCyclic( uint32_t streamSize = acc.GetSize(); CPDF_Dictionary* pDict = GetDict(); if (pDict && !pdfium::ContainsKey(*pVisited, pDict)) { - pDict = ToDictionary( - static_cast<CPDF_Object*>(pDict)->CloneNonCyclic(bDirect, pVisited)); + pDict = ToDictionary(static_cast<CPDF_Object*>(pDict) + ->CloneNonCyclic(bDirect, pVisited) + .release()); } - - return new CPDF_Stream(acc.DetachData(), streamSize, pDict); + return pdfium::MakeUnique<CPDF_Stream>(acc.DetachData(), streamSize, pDict); } void CPDF_Stream::SetData(const uint8_t* pData, uint32_t size) { |