| OLD | NEW |
| 1 // Copyright 2016 PDFium Authors. All rights reserved. | 1 // Copyright 2016 PDFium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com | 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com |
| 6 | 6 |
| 7 #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h" | 7 #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h" |
| 8 | 8 |
| 9 #include "core/fpdfapi/parser/cpdf_object.h" | 9 #include "core/fpdfapi/parser/cpdf_object.h" |
| 10 #include "core/fpdfapi/parser/cpdf_parser.h" | 10 #include "core/fpdfapi/parser/cpdf_parser.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 | 48 |
| 49 m_LastObjNum++; | 49 m_LastObjNum++; |
| 50 m_IndirectObjs[m_LastObjNum].release(); // TODO(tsepez): stop this leak. | 50 m_IndirectObjs[m_LastObjNum].release(); // TODO(tsepez): stop this leak. |
| 51 m_IndirectObjs[m_LastObjNum].reset(pObj); | 51 m_IndirectObjs[m_LastObjNum].reset(pObj); |
| 52 pObj->m_ObjNum = m_LastObjNum; | 52 pObj->m_ObjNum = m_LastObjNum; |
| 53 return m_LastObjNum; | 53 return m_LastObjNum; |
| 54 } | 54 } |
| 55 | 55 |
| 56 bool CPDF_IndirectObjectHolder::ReplaceIndirectObjectIfHigherGeneration( | 56 bool CPDF_IndirectObjectHolder::ReplaceIndirectObjectIfHigherGeneration( |
| 57 uint32_t objnum, | 57 uint32_t objnum, |
| 58 CPDF_Object* pObj) { | 58 std::unique_ptr<CPDF_Object> pObj) { |
| 59 ASSERT(objnum); | 59 ASSERT(objnum); |
| 60 if (!pObj) | 60 if (!pObj) |
| 61 return false; | 61 return false; |
| 62 | 62 |
| 63 CPDF_Object* pOldObj = GetIndirectObject(objnum); | 63 CPDF_Object* pOldObj = GetIndirectObject(objnum); |
| 64 if (pOldObj && pObj->GetGenNum() <= pOldObj->GetGenNum()) { | 64 if (pOldObj && pObj->GetGenNum() <= pOldObj->GetGenNum()) |
| 65 delete pObj; | |
| 66 return false; | 65 return false; |
| 67 } | 66 |
| 68 pObj->m_ObjNum = objnum; | 67 pObj->m_ObjNum = objnum; |
| 69 m_IndirectObjs[objnum].reset(pObj); | 68 m_IndirectObjs[objnum] = std::move(pObj); |
| 70 m_LastObjNum = std::max(m_LastObjNum, objnum); | 69 m_LastObjNum = std::max(m_LastObjNum, objnum); |
| 71 return true; | 70 return true; |
| 72 } | 71 } |
| 73 | 72 |
| 74 void CPDF_IndirectObjectHolder::DeleteIndirectObject(uint32_t objnum) { | 73 void CPDF_IndirectObjectHolder::DeleteIndirectObject(uint32_t objnum) { |
| 75 CPDF_Object* pObj = GetIndirectObject(objnum); | 74 CPDF_Object* pObj = GetIndirectObject(objnum); |
| 76 if (!pObj || pObj->GetObjNum() == CPDF_Object::kInvalidObjNum) | 75 if (!pObj || pObj->GetObjNum() == CPDF_Object::kInvalidObjNum) |
| 77 return; | 76 return; |
| 78 | 77 |
| 79 m_IndirectObjs.erase(objnum); | 78 m_IndirectObjs.erase(objnum); |
| 80 } | 79 } |
| OLD | NEW |