From 85e622ce52eb3864e94d0fa387af39fc6993bacf Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 23 Aug 2018 16:55:14 +0000 Subject: Fold CPDF_Document::LoadDocInternal() into caller. It is only called in one place. It also has a superfluous test and return as it is currently written introduced in https://pdfium-review.googlesource.com/c/pdfium/+/35490 Change-Id: Iba1aaac6e93c261f71729f39e51741f19c5dbb57 Reviewed-on: https://pdfium-review.googlesource.com/41071 Reviewed-by: Henrique Nakashima Commit-Queue: Tom Sepez --- core/fpdfapi/parser/cpdf_document.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'core/fpdfapi/parser/cpdf_document.cpp') diff --git a/core/fpdfapi/parser/cpdf_document.cpp b/core/fpdfapi/parser/cpdf_document.cpp index 1dd801de69..63556de250 100644 --- a/core/fpdfapi/parser/cpdf_document.cpp +++ b/core/fpdfapi/parser/cpdf_document.cpp @@ -196,22 +196,15 @@ std::unique_ptr CPDF_Document::ParseIndirectObject( return m_pParser ? m_pParser->ParseIndirectObject(objnum) : nullptr; } -void CPDF_Document::LoadDocInternal() { +bool CPDF_Document::TryInit() { SetLastObjNum(m_pParser->GetLastObjNum()); CPDF_Object* pRootObj = GetOrParseIndirectObject(m_pParser->GetRootObjNum()); - if (!pRootObj) - return; - - m_pRootDict = pRootObj->GetDict(); - if (!m_pRootDict) - return; -} + if (pRootObj) + m_pRootDict = pRootObj->GetDict(); -bool CPDF_Document::TryInit() { - LoadDocInternal(); LoadPages(); - return GetRoot() && (GetPageCount() > 0); + return GetRoot() && GetPageCount() > 0; } CPDF_Parser::Error CPDF_Document::LoadDoc( -- cgit v1.2.3