diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-06-11 17:17:27 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-11 17:17:27 +0000 |
| commit | 52239566107bda5d0d44395e5f3b6629356c2e23 (patch) | |
| tree | 6286cde94bc7b8565faaf4c06922c3dc5301608c /core/fpdfapi | |
| parent | 88398a4286dd2bd228d79fb0f3296b9f79cbe4a9 (diff) | |
| download | pdfium-52239566107bda5d0d44395e5f3b6629356c2e23.tar.xz | |
Replace FPDF_PAGE_MAX_NUM with class scoped constant.
Also avoids confusion with unrelated FPDF_PAGE API type.
Bug: pdfium:1085
Change-Id: I36569573f020f0b87f13630bbab91caf351e4994
Reviewed-on: https://pdfium-review.googlesource.com/34830
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfapi')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_document.cpp | 2 | ||||
| -rw-r--r-- | core/fpdfapi/parser/cpdf_document.h | 4 | ||||
| -rw-r--r-- | core/fpdfapi/parser/cpdf_hint_tables.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/fpdfapi/parser/cpdf_document.cpp b/core/fpdfapi/parser/cpdf_document.cpp index 995d7edaf9..59927bc250 100644 --- a/core/fpdfapi/parser/cpdf_document.cpp +++ b/core/fpdfapi/parser/cpdf_document.cpp @@ -95,7 +95,7 @@ void InsertWidthArray1(CFX_Font* pFont, int CountPages(CPDF_Dictionary* pPages, std::set<CPDF_Dictionary*>* visited_pages) { int count = pPages->GetIntegerFor("Count"); - if (count > 0 && count < FPDF_PAGE_MAX_NUM) + if (count > 0 && count < CPDF_Document::kPageMaxNum) return count; CPDF_Array* pKidList = pPages->GetArrayFor("Kids"); if (!pKidList) diff --git a/core/fpdfapi/parser/cpdf_document.h b/core/fpdfapi/parser/cpdf_document.h index a34b25d001..d196438e80 100644 --- a/core/fpdfapi/parser/cpdf_document.h +++ b/core/fpdfapi/parser/cpdf_document.h @@ -38,8 +38,6 @@ class JBig2_DocumentContext; #define FPDFPERM_FILL_FORM 0x0100 #define FPDFPERM_EXTRACT_ACCESS 0x0200 -#define FPDF_PAGE_MAX_NUM 0xFFFFF - class CPDF_Document : public CPDF_IndirectObjectHolder { public: // Type from which the XFA extension can subclass itself. @@ -52,6 +50,8 @@ class CPDF_Document : public CPDF_IndirectObjectHolder { virtual uint32_t GetUserPermissions() const = 0; }; + static const int kPageMaxNum = 0xFFFFF; + explicit CPDF_Document(std::unique_ptr<CPDF_Parser> pParser); ~CPDF_Document() override; diff --git a/core/fpdfapi/parser/cpdf_hint_tables.cpp b/core/fpdfapi/parser/cpdf_hint_tables.cpp index 65beda7e2a..a85fb2b052 100644 --- a/core/fpdfapi/parser/cpdf_hint_tables.cpp +++ b/core/fpdfapi/parser/cpdf_hint_tables.cpp @@ -132,7 +132,7 @@ bool CPDF_HintTables::ReadPageHintTable(CFX_BitStream* hStream) { hStream->SkipBits(16); const uint32_t nPages = m_pLinearized->GetPageCount(); - if (nPages < 1 || nPages >= FPDF_PAGE_MAX_NUM) + if (nPages < 1 || nPages >= CPDF_Document::kPageMaxNum) return false; const uint32_t dwPages = pdfium::base::checked_cast<uint32_t>(nPages); |