From 4de3d095c9d9e961f93750cf1ebd489fd515be12 Mon Sep 17 00:00:00 2001 From: tsepez Date: Thu, 3 Nov 2016 17:05:07 -0700 Subject: Remove CPDF_Object::Release() in favor of direct delete Follow-on once we prove Release always deletes in previous CL. Review-Url: https://codereview.chromium.org/2384883003 --- fpdfsdk/fpdfdoc_unittest.cpp | 2 +- fpdfsdk/fpdfppo.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/fpdfdoc_unittest.cpp b/fpdfsdk/fpdfdoc_unittest.cpp index 408d2fa0d8..39e81d52e8 100644 --- a/fpdfsdk/fpdfdoc_unittest.cpp +++ b/fpdfsdk/fpdfdoc_unittest.cpp @@ -87,7 +87,7 @@ class PDFDocTest : public testing::Test { protected: std::unique_ptr m_pDoc; CPDF_IndirectObjectHolder* m_pIndirectObjs; - std::unique_ptr> m_pRootObj; + std::unique_ptr m_pRootObj; }; TEST_F(PDFDocTest, FindBookmark) { diff --git a/fpdfsdk/fpdfppo.cpp b/fpdfsdk/fpdfppo.cpp index 22b23d1db1..ccfd141db2 100644 --- a/fpdfsdk/fpdfppo.cpp +++ b/fpdfsdk/fpdfppo.cpp @@ -285,11 +285,11 @@ uint32_t CPDF_PageOrganizer::GetNewObjId(CPDF_Document* pDoc, if (pDictClone->KeyExist("Type")) { CFX_ByteString strType = pDictClone->GetStringFor("Type"); if (!FXSYS_stricmp(strType.c_str(), "Pages")) { - pDictClone->Release(); + delete pDictClone; return 4; } if (!FXSYS_stricmp(strType.c_str(), "Page")) { - pDictClone->Release(); + delete pDictClone; return 0; } } @@ -297,7 +297,7 @@ uint32_t CPDF_PageOrganizer::GetNewObjId(CPDF_Document* pDoc, dwNewObjNum = pDoc->AddIndirectObject(pClone); (*pObjNumberMap)[dwObjnum] = dwNewObjNum; if (!UpdateReference(pClone, pDoc, pObjNumberMap)) { - pClone->Release(); + delete pClone; return 0; } return dwNewObjNum; -- cgit v1.2.3