diff options
author | Tom Sepez <tsepez@chromium.org> | 2018-05-08 13:40:20 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-08 13:40:20 +0000 |
commit | 967aa0793c0b0cf2722ec8720e9d797266a9fde7 (patch) | |
tree | 46c32ab1adcadd770261093d6bb57e2e1886bf32 /core/fpdfapi/parser/cpdf_data_avail.cpp | |
parent | e5c0fa97c2da104426dbc1cecfc0ed488a22efe5 (diff) | |
download | pdfium-967aa0793c0b0cf2722ec8720e9d797266a9fde7.tar.xz |
Rename CPDF_Document::GetPage() to GetPageDictionary().
Avoids a conflict should we wish to have the document actually
track pages, with a GetPage() that returns CPDF_Page.
Do the same thing to CPDF_DataAvail along the way.
Add some missing consts as well.
Change-Id: I2cb2213cc4c0649662fceab80407ee4a3f4cf30e
Reviewed-on: https://pdfium-review.googlesource.com/32158
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser/cpdf_data_avail.cpp')
-rw-r--r-- | core/fpdfapi/parser/cpdf_data_avail.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/fpdfapi/parser/cpdf_data_avail.cpp b/core/fpdfapi/parser/cpdf_data_avail.cpp index e871e0a578..3ffe6f6f0b 100644 --- a/core/fpdfapi/parser/cpdf_data_avail.cpp +++ b/core/fpdfapi/parser/cpdf_data_avail.cpp @@ -475,7 +475,7 @@ bool CPDF_DataAvail::CheckHintTables() { std::unique_ptr<CPDF_Object> CPDF_DataAvail::ParseIndirectObjectAt( FX_FILESIZE pos, uint32_t objnum, - CPDF_IndirectObjectHolder* pObjList) { + CPDF_IndirectObjectHolder* pObjList) const { const FX_FILESIZE SavedPos = GetSyntaxParser()->GetPos(); GetSyntaxParser()->SetPos(pos); std::unique_ptr<CPDF_Object> result = GetSyntaxParser()->GetIndirectObject( @@ -828,7 +828,7 @@ CPDF_DataAvail::DocAvailStatus CPDF_DataAvail::IsPageAvail( if (m_pLinearized) { if (dwPage == m_pLinearized->GetFirstPageNo()) { - CPDF_Dictionary* pPageDict = m_pDocument->GetPage(safePage.ValueOrDie()); + auto* pPageDict = m_pDocument->GetPageDictionary(safePage.ValueOrDie()); if (!pPageDict) return DataError; @@ -850,7 +850,7 @@ CPDF_DataAvail::DocAvailStatus CPDF_DataAvail::IsPageAvail( nResult = m_pHintTables->CheckPage(dwPage); if (nResult != DataAvailable) return nResult; - if (GetPage(dwPage)) { + if (GetPageDictionary(dwPage)) { m_pagesLoadState.insert(dwPage); return DataAvailable; } @@ -879,7 +879,7 @@ CPDF_DataAvail::DocAvailStatus CPDF_DataAvail::IsPageAvail( if (CheckAcroForm() == DocFormStatus::FormNotAvailable) return DataNotAvailable; - CPDF_Dictionary* pPageDict = m_pDocument->GetPage(safePage.ValueOrDie()); + auto* pPageDict = m_pDocument->GetPageDictionary(safePage.ValueOrDie()); if (!pPageDict) return DataError; @@ -943,10 +943,10 @@ int CPDF_DataAvail::GetPageCount() const { return m_pDocument ? m_pDocument->GetPageCount() : 0; } -CPDF_Dictionary* CPDF_DataAvail::GetPage(int index) { +CPDF_Dictionary* CPDF_DataAvail::GetPageDictionary(int index) const { if (!m_pDocument || index < 0 || index >= GetPageCount()) return nullptr; - CPDF_Dictionary* page = m_pDocument->GetPage(index); + CPDF_Dictionary* page = m_pDocument->GetPageDictionary(index); if (page) return page; if (!m_pLinearized || !m_pHintTables) @@ -970,7 +970,7 @@ CPDF_Dictionary* CPDF_DataAvail::GetPage(int index) { } if (!ValidatePage(index)) return nullptr; - return m_pDocument->GetPage(index); + return m_pDocument->GetPageDictionary(index); } CPDF_DataAvail::DocFormStatus CPDF_DataAvail::IsFormAvail( @@ -1016,9 +1016,9 @@ CPDF_DataAvail::DocFormStatus CPDF_DataAvail::CheckAcroForm() { return DocFormStatus::FormError; } -bool CPDF_DataAvail::ValidatePage(uint32_t dwPage) { +bool CPDF_DataAvail::ValidatePage(uint32_t dwPage) const { FX_SAFE_INT32 safePage = pdfium::base::checked_cast<int32_t>(dwPage); - CPDF_Dictionary* pPageDict = m_pDocument->GetPage(safePage.ValueOrDie()); + auto* pPageDict = m_pDocument->GetPageDictionary(safePage.ValueOrDie()); if (!pPageDict) return false; CPDF_PageObjectAvail obj_avail(GetValidator().Get(), m_pDocument, pPageDict); |