From 33fdebc3da676bff84d0fd0f69b9087c0c12dfeb Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 4 Nov 2016 11:38:40 -0700 Subject: Reland "Remove CPDF_Object::Release() in favor of direct delete" This reverts commit f0d5b6c35fa343108a3ab7a25bc2cc2b3cf105b3. Review-Url: https://codereview.chromium.org/2478303002 --- core/fpdfapi/page/fpdf_page_parser_old.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'core/fpdfapi/page/fpdf_page_parser_old.cpp') diff --git a/core/fpdfapi/page/fpdf_page_parser_old.cpp b/core/fpdfapi/page/fpdf_page_parser_old.cpp index 0d1db43825..51ffc11b03 100644 --- a/core/fpdfapi/page/fpdf_page_parser_old.cpp +++ b/core/fpdfapi/page/fpdf_page_parser_old.cpp @@ -138,9 +138,7 @@ CPDF_StreamParser::CPDF_StreamParser( m_pPool(pPool) {} CPDF_StreamParser::~CPDF_StreamParser() { - if (m_pLastObj) { - m_pLastObj->Release(); - } + delete m_pLastObj; } CPDF_Stream* CPDF_StreamParser::ReadInlineStream(CPDF_Document* pDoc, @@ -252,10 +250,8 @@ CPDF_Stream* CPDF_StreamParser::ReadInlineStream(CPDF_Document* pDoc, } CPDF_StreamParser::SyntaxType CPDF_StreamParser::ParseNextElement() { - if (m_pLastObj) { - m_pLastObj->Release(); - m_pLastObj = nullptr; - } + delete m_pLastObj; + m_pLastObj = nullptr; m_WordSize = 0; bool bIsNumber = true; @@ -374,7 +370,7 @@ CPDF_Object* CPDF_StreamParser::ReadNextObject(bool bAllowNestedArray, break; if (!m_WordSize || m_WordBuffer[0] != '/') { - pDict->Release(); + delete pDict; return nullptr; } @@ -382,12 +378,12 @@ CPDF_Object* CPDF_StreamParser::ReadNextObject(bool bAllowNestedArray, PDF_NameDecode(CFX_ByteStringC(m_WordBuffer + 1, m_WordSize - 1)); CPDF_Object* pObj = ReadNextObject(true, 0); if (!pObj) { - pDict->Release(); + delete pDict; return nullptr; } if (key.IsEmpty()) - pObj->Release(); + delete pObj; else pDict->SetFor(key, pObj); } -- cgit v1.2.3