diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-10-04 16:51:16 -0400 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-10-05 17:04:50 +0000 |
commit | 645e78a1152b035fb83ac5bbe93715b54f11a1b6 (patch) | |
tree | e3de326e955bf60c94303397c04d46072ff8e43d /core/fpdfapi/parser/cpdf_indirect_object_holder.cpp | |
parent | 5e2cfb5310c9b25a5ce4c772a6656373309bc956 (diff) | |
download | pdfium-645e78a1152b035fb83ac5bbe93715b54f11a1b6.tar.xz |
Remove CPDF_Object friends
This CL removes the friends from CPDF_Object and adds accessors as
needed. The m_GenNum was moved to a private member as none of the
overriding classes needed access.
Change-Id: If23a1a6752dea31eb80669a36694973f3c581123
Reviewed-on: https://pdfium-review.googlesource.com/15470
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser/cpdf_indirect_object_holder.cpp')
-rw-r--r-- | core/fpdfapi/parser/cpdf_indirect_object_holder.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp b/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp index 2a57411368..42e312ca64 100644 --- a/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp +++ b/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp @@ -52,7 +52,7 @@ CPDF_Object* CPDF_IndirectObjectHolder::GetOrParseIndirectObject( return nullptr; } - pNewObj->m_ObjNum = objnum; + pNewObj->SetObjNum(objnum); m_LastObjNum = std::max(m_LastObjNum, objnum); insert_result.first->second = std::move(pNewObj); return insert_result.first->second.get(); @@ -65,8 +65,8 @@ std::unique_ptr<CPDF_Object> CPDF_IndirectObjectHolder::ParseIndirectObject( CPDF_Object* CPDF_IndirectObjectHolder::AddIndirectObject( std::unique_ptr<CPDF_Object> pObj) { - CHECK(!pObj->m_ObjNum); - pObj->m_ObjNum = ++m_LastObjNum; + CHECK(!pObj->GetObjNum()); + pObj->SetObjNum(++m_LastObjNum); auto& obj_holder = m_IndirectObjs[m_LastObjNum]; if (obj_holder) @@ -84,13 +84,11 @@ bool CPDF_IndirectObjectHolder::ReplaceIndirectObjectIfHigherGeneration( return false; auto& obj_holder = m_IndirectObjs[objnum]; - const CPDF_Object* old_object = FilterInvalidObjNum(obj_holder.get()); - if (old_object && pObj->GetGenNum() <= old_object->GetGenNum()) return false; - pObj->m_ObjNum = objnum; + pObj->SetObjNum(objnum); if (obj_holder) m_OrphanObjs.push_back(std::move(obj_holder)); |