diff options
| author | Artem Strygin <art-snake@yandex-team.ru> | 2017-08-28 14:13:00 +0300 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-28 15:20:20 +0000 |
| commit | a8efb5183422e07210771c975e5ae7655957cc77 (patch) | |
| tree | 605155a8d0468cf3cad53114ac5ffe913eca8710 /core/fpdfapi/parser/cpdf_syntax_parser.h | |
| parent | 574d4408a5174bb410cf4ec3db24283671bcce79 (diff) | |
| download | pdfium-a8efb5183422e07210771c975e5ae7655957cc77.tar.xz | |
Unify CPDF_SyntaxParser::GetObjectXXX methods.
Merge CPDF_SyntaxParser::GetObject and CPDF_SyntaxParser::GetObjectForStrict.
Change-Id: Ic9ff51e24ee981c268239847e3cca1c6f6a6f269
Reviewed-on: https://pdfium-review.googlesource.com/10511
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser/cpdf_syntax_parser.h')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_syntax_parser.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/core/fpdfapi/parser/cpdf_syntax_parser.h b/core/fpdfapi/parser/cpdf_syntax_parser.h index d3bca11e59..25c7403961 100644 --- a/core/fpdfapi/parser/cpdf_syntax_parser.h +++ b/core/fpdfapi/parser/cpdf_syntax_parser.h @@ -46,7 +46,8 @@ class CPDF_SyntaxParser { std::unique_ptr<CPDF_Object> GetObjectForStrict( CPDF_IndirectObjectHolder* pObjList, uint32_t objnum, - uint32_t gennum); + uint32_t gennum, + bool bDecrypt); CFX_ByteString GetKeyword(); void ToNextLine(); @@ -95,16 +96,14 @@ class CPDF_SyntaxParser { static_cast<FX_FILESIZE>(m_BufOffset + m_BufSize) <= pos; } + enum class ParseType { kStrict, kLoose }; + std::unique_ptr<CPDF_Object> GetObjectInternal( CPDF_IndirectObjectHolder* pObjList, uint32_t objnum, uint32_t gennum, - bool bDecrypt); - - std::unique_ptr<CPDF_Object> GetObjectForStrictInternal( - CPDF_IndirectObjectHolder* pObjList, - uint32_t objnum, - uint32_t gennum); + bool bDecrypt, + ParseType parse_type); FX_FILESIZE m_Pos; uint32_t m_MetadataObjnum; |