diff options
| author | tsepez <tsepez@chromium.org> | 2016-11-04 11:38:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-11-04 11:38:40 -0700 |
| commit | 33fdebc3da676bff84d0fd0f69b9087c0c12dfeb (patch) | |
| tree | 274499f6bc4df60ebb57a52bf78b82180ea52295 /fpdfsdk | |
| parent | 761eed284e1248f851fbb23beaa45835b644ecee (diff) | |
| download | pdfium-33fdebc3da676bff84d0fd0f69b9087c0c12dfeb.tar.xz | |
Reland "Remove CPDF_Object::Release() in favor of direct delete"
This reverts commit f0d5b6c35fa343108a3ab7a25bc2cc2b3cf105b3.
Review-Url: https://codereview.chromium.org/2478303002
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/fpdfdoc_unittest.cpp | 2 | ||||
| -rw-r--r-- | fpdfsdk/fpdfppo.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
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<CPDF_TestPdfDocument> m_pDoc; CPDF_IndirectObjectHolder* m_pIndirectObjs; - std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Dictionary>> m_pRootObj; + std::unique_ptr<CPDF_Dictionary> 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; |