diff options
author | tsepez <tsepez@chromium.org> | 2016-11-07 13:49:17 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-11-07 13:49:17 -0800 |
commit | 5ab31ef3ed4c86211f1ebb3686abb4f5a66472ec (patch) | |
tree | 87c1fda94151528b7fcfa3a18cfda87a78cd3b4f /core/fpdfapi/parser/cpdf_indirect_object_holder.cpp | |
parent | c09625ca59701fabeb49dc59edcf33031b2c6672 (diff) | |
download | pdfium-5ab31ef3ed4c86211f1ebb3686abb4f5a66472ec.tar.xz |
Use unique_ptr return from CPDF_Parser::ParseIndirectObject()
In turn, propgate to callers. This introduces a few
release() calls that will go away as more code is converted.
It also removes a couple of WrapUnique calls that are no
longer needed as ownership of the object flows along.
Review-Url: https://codereview.chromium.org/2479303002
Diffstat (limited to 'core/fpdfapi/parser/cpdf_indirect_object_holder.cpp')
-rw-r--r-- | core/fpdfapi/parser/cpdf_indirect_object_holder.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp b/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp index b2cb08c08a..529eda21fb 100644 --- a/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp +++ b/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp @@ -28,17 +28,18 @@ CPDF_Object* CPDF_IndirectObjectHolder::GetOrParseIndirectObject( if (pObj) return pObj->GetObjNum() != CPDF_Object::kInvalidObjNum ? pObj : nullptr; - pObj = ParseIndirectObject(objnum); - if (!pObj) + std::unique_ptr<CPDF_Object> pNewObj = ParseIndirectObject(objnum); + if (!pNewObj) return nullptr; - pObj->m_ObjNum = objnum; + pNewObj->m_ObjNum = objnum; m_LastObjNum = std::max(m_LastObjNum, objnum); - m_IndirectObjs[objnum].reset(pObj); - return pObj; + m_IndirectObjs[objnum] = std::move(pNewObj); + return m_IndirectObjs[objnum].get(); } -CPDF_Object* CPDF_IndirectObjectHolder::ParseIndirectObject(uint32_t objnum) { +std::unique_ptr<CPDF_Object> CPDF_IndirectObjectHolder::ParseIndirectObject( + uint32_t objnum) { return nullptr; } |