From 4eb4d7f6c707cc2c23c806aa540d055c8832b55d Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 22 Jul 2015 15:04:26 -0700 Subject: Revert "Fix else-after-returns throughout pdfium." This reverts commit 7cc97521db1e52d5927f5605de5f9a7102f8af40. --- core/src/fpdfapi/fpdf_page/fpdf_page.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'core/src/fpdfapi/fpdf_page/fpdf_page.cpp') diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp index c0cdb228f4..db3966ec17 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp @@ -754,17 +754,18 @@ void CPDF_PageObjects::ContinueParse(IFX_Pause* pPause) } int CPDF_PageObjects::EstimateParseProgress() const { - if (!m_pParser) { + if (m_pParser == NULL) { return m_ParseState == PDF_CONTENT_PARSED ? 100 : 0; } return m_pParser->EstimateProgress(); } FX_POSITION CPDF_PageObjects::InsertObject(FX_POSITION posInsertAfter, CPDF_PageObject* pNewObject) { - if (!posInsertAfter) { + if (posInsertAfter == NULL) { return m_ObjectList.AddHead(pNewObject); + } else { + return m_ObjectList.InsertAfter(posInsertAfter, pNewObject); } - return m_ObjectList.InsertAfter(posInsertAfter, pNewObject); } int CPDF_PageObjects::GetObjectIndex(CPDF_PageObject* pObj) const { -- cgit v1.2.3