summaryrefslogtreecommitdiff
path: root/core/fpdfapi/parser/cpdf_parser.cpp
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-11-09 13:28:26 -0800
committerCommit bot <commit-bot@chromium.org>2016-11-09 13:28:26 -0800
commit335cf093231c984a23cb9ea113148ea1f19621ba (patch)
treee9c7803b0ce71269beb3d423549a2d6a0ac7784a /core/fpdfapi/parser/cpdf_parser.cpp
parent3ff4deea307c38462393e4f83dabe32949338168 (diff)
downloadpdfium-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_parser.cpp')
-rw-r--r--core/fpdfapi/parser/cpdf_parser.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/core/fpdfapi/parser/cpdf_parser.cpp b/core/fpdfapi/parser/cpdf_parser.cpp
index ed20cf73f4..2d96834964 100644
--- a/core/fpdfapi/parser/cpdf_parser.cpp
+++ b/core/fpdfapi/parser/cpdf_parser.cpp
@@ -737,8 +737,7 @@ bool CPDF_Parser::RebuildCrossRef() {
CPDF_Object* pRoot = pDict->GetObjectFor("Root");
if (pRoot && pRoot->GetDict() &&
pRoot->GetDict()->GetObjectFor("Pages")) {
- m_pTrailer =
- ToDictionary(pdfium::WrapUnique(pDict->Clone()));
+ m_pTrailer = ToDictionary(pDict->Clone());
}
}
}
@@ -811,14 +810,14 @@ bool CPDF_Parser::RebuildCrossRef() {
m_pTrailer->SetReferenceFor(key, m_pDocument,
dwObjNum);
} else {
- m_pTrailer->SetFor(key, pElement->Clone());
+ m_pTrailer->SetFor(key,
+ pElement->Clone().release());
}
}
}
} else {
if (pObj->IsStream()) {
- m_pTrailer =
- ToDictionary(pdfium::WrapUnique(pTrailer->Clone()));
+ m_pTrailer = ToDictionary(pTrailer->Clone());
} else {
m_pTrailer = ToDictionary(std::move(pObj));
}
@@ -959,8 +958,7 @@ bool CPDF_Parser::LoadCrossRefV5(FX_FILESIZE* pos, bool bMainXRef) {
if (size < 0)
return false;
- std::unique_ptr<CPDF_Dictionary> pNewTrailer =
- ToDictionary(pdfium::WrapUnique(pDict->Clone()));
+ std::unique_ptr<CPDF_Dictionary> pNewTrailer = ToDictionary(pDict->Clone());
if (bMainXRef) {
m_pTrailer = std::move(pNewTrailer);
ShrinkObjectMap(size);