diff options
author | Lei Zhang <thestig@chromium.org> | 2016-01-05 16:33:12 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2016-01-05 16:33:12 -0800 |
commit | 62664cee15230d6cbe08ed010721a4557b36dc22 (patch) | |
tree | 2baf5570b23f51e082f3ab3e8de88d8538043ae3 /core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp | |
parent | 6ba32d9e65ef5d40d357876f9457e228a5fab308 (diff) | |
download | pdfium-62664cee15230d6cbe08ed010721a4557b36dc22.tar.xz |
Merge to XFA: Fix a few uses of default arguments.
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1555293002 .
(cherry picked from commit dbfaa8d11404a53b4807b3dbd0185047367bbff6)
Review URL: https://codereview.chromium.org/1565603002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp index bf94185720..0b41e3f1cc 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp @@ -34,7 +34,8 @@ CPDF_DocRenderData* CPDF_Document::GetValidateRenderData() { } void CPDF_Document::LoadDoc() { m_LastObjNum = m_pParser->GetLastObjNum(); - CPDF_Object* pRootObj = GetIndirectObject(m_pParser->GetRootObjNum()); + CPDF_Object* pRootObj = + GetIndirectObject(m_pParser->GetRootObjNum(), nullptr); if (!pRootObj) { return; } @@ -42,7 +43,8 @@ void CPDF_Document::LoadDoc() { if (!m_pRootDict) { return; } - CPDF_Object* pInfoObj = GetIndirectObject(m_pParser->GetInfoObjNum()); + CPDF_Object* pInfoObj = + GetIndirectObject(m_pParser->GetInfoObjNum(), nullptr); if (pInfoObj) { m_pInfoDict = pInfoObj->GetDict(); } @@ -56,13 +58,14 @@ void CPDF_Document::LoadDoc() { void CPDF_Document::LoadAsynDoc(CPDF_Dictionary* pLinearized) { m_bLinearized = TRUE; m_LastObjNum = m_pParser->GetLastObjNum(); - CPDF_Object* indirectObj = GetIndirectObject(m_pParser->GetRootObjNum()); - m_pRootDict = indirectObj ? indirectObj->GetDict() : NULL; + CPDF_Object* pIndirectObj = + GetIndirectObject(m_pParser->GetRootObjNum(), nullptr); + m_pRootDict = pIndirectObj ? pIndirectObj->GetDict() : nullptr; if (!m_pRootDict) { return; } - indirectObj = GetIndirectObject(m_pParser->GetInfoObjNum()); - m_pInfoDict = indirectObj ? indirectObj->GetDict() : NULL; + pIndirectObj = GetIndirectObject(m_pParser->GetInfoObjNum(), nullptr); + m_pInfoDict = pIndirectObj ? pIndirectObj->GetDict() : nullptr; CPDF_Array* pIDArray = m_pParser->GetIDArray(); if (pIDArray) { m_ID1 = pIDArray->GetString(0); @@ -142,14 +145,16 @@ CPDF_Dictionary* CPDF_Document::GetPage(int iPage) { if (m_bLinearized && (iPage == (int)m_dwFirstPageNo)) { if (CPDF_Dictionary* pDict = - ToDictionary(GetIndirectObject(m_dwFirstPageObjNum))) + ToDictionary(GetIndirectObject(m_dwFirstPageObjNum, nullptr))) return pDict; } int objnum = m_PageList.GetAt(iPage); if (objnum) { - if (CPDF_Dictionary* pDict = ToDictionary(GetIndirectObject(objnum))) + if (CPDF_Dictionary* pDict = + ToDictionary(GetIndirectObject(objnum, nullptr))) { return pDict; + } } CPDF_Dictionary* pRoot = GetRoot(); |