From 335cf093231c984a23cb9ea113148ea1f19621ba Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 9 Nov 2016 13:28:26 -0800 Subject: 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 --- core/fpdfapi/page/cpdf_contentmarkitem.cpp | 2 +- core/fpdfapi/page/cpdf_streamcontentparser.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'core/fpdfapi/page') diff --git a/core/fpdfapi/page/cpdf_contentmarkitem.cpp b/core/fpdfapi/page/cpdf_contentmarkitem.cpp index dffeada707..48a9679251 100644 --- a/core/fpdfapi/page/cpdf_contentmarkitem.cpp +++ b/core/fpdfapi/page/cpdf_contentmarkitem.cpp @@ -16,7 +16,7 @@ CPDF_ContentMarkItem::CPDF_ContentMarkItem(const CPDF_ContentMarkItem& that) m_ParamType(that.m_ParamType), m_pPropertiesDict(that.m_pPropertiesDict) { if (that.m_pDirectDict) - m_pDirectDict.reset(that.m_pDirectDict->Clone()->AsDictionary()); + m_pDirectDict = ToDictionary(that.m_pDirectDict->Clone()); } CPDF_ContentMarkItem::~CPDF_ContentMarkItem() {} diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp index cd77c0b633..e7d23c0522 100644 --- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp +++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp @@ -667,7 +667,7 @@ void CPDF_StreamContentParser::Handle_BeginImage() { if (name != "DeviceRGB" && name != "DeviceGray" && name != "DeviceCMYK") { pCSObj = FindResourceObj("ColorSpace", name); if (pCSObj && pCSObj->IsInline()) { - pCSObj = pCSObj->Clone(); + pCSObj = pCSObj->Clone().release(); pDict->SetFor("ColorSpace", pCSObj); } } -- cgit v1.2.3