diff options
author | Artem Strygin <art-snake@yandex-team.ru> | 2017-09-22 00:06:59 +0300 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-21 21:44:36 +0000 |
commit | 09b5ce623fc47bc3d19d60aa2a219c838971dd4b (patch) | |
tree | 3f6d000ff4894f29cc86d4c29e90d19059b91b81 /core/fpdfapi/parser/cpdf_syntax_parser.cpp | |
parent | b872a93e5cd940dc28ad960b13b0cf01a6db3400 (diff) | |
download | pdfium-09b5ce623fc47bc3d19d60aa2a219c838971dd4b.tar.xz |
Rename CPDF_SyntaxParser::GetObject to GetObjectBody
Change-Id: Ia8fd1893f862391fbada396f505ac16985b59cd6
Reviewed-on: https://pdfium-review.googlesource.com/12850
Commit-Queue: Art Snake <art-snake@yandex-team.ru>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser/cpdf_syntax_parser.cpp')
-rw-r--r-- | core/fpdfapi/parser/cpdf_syntax_parser.cpp | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/core/fpdfapi/parser/cpdf_syntax_parser.cpp b/core/fpdfapi/parser/cpdf_syntax_parser.cpp index bf6d90ca9a..96a863e661 100644 --- a/core/fpdfapi/parser/cpdf_syntax_parser.cpp +++ b/core/fpdfapi/parser/cpdf_syntax_parser.cpp @@ -360,20 +360,20 @@ ByteString CPDF_SyntaxParser::GetKeyword() { return GetNextWord(nullptr); } -std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObject( +std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObjectBody( CPDF_IndirectObjectHolder* pObjList, uint32_t objnum, uint32_t gennum, bool bDecrypt) { const CPDF_ReadValidator::Session read_session(GetValidator().Get()); - auto result = - GetObjectInternal(pObjList, objnum, gennum, bDecrypt, ParseType::kLoose); + auto result = GetObjectBodyInternal(pObjList, objnum, gennum, bDecrypt, + ParseType::kLoose); if (GetValidator()->has_read_problems()) return nullptr; return result; } -std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObjectInternal( +std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObjectBodyInternal( CPDF_IndirectObjectHolder* pObjList, uint32_t objnum, uint32_t gennum, @@ -425,8 +425,8 @@ std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObjectInternal( } if (word == "[") { auto pArray = pdfium::MakeUnique<CPDF_Array>(); - while (std::unique_ptr<CPDF_Object> pObj = - GetObject(pObjList, objnum, gennum, true)) { + while (std::unique_ptr<CPDF_Object> pObj = GetObjectBodyInternal( + pObjList, objnum, gennum, true, ParseType::kLoose)) { pArray->Add(std::move(pObj)); } return (parse_type == ParseType::kLoose || m_WordBuffer[0] == ']') @@ -465,8 +465,8 @@ std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObjectInternal( if (key.IsEmpty() && parse_type == ParseType::kLoose) continue; - std::unique_ptr<CPDF_Object> pObj = - GetObject(pObjList, objnum, gennum, true); + std::unique_ptr<CPDF_Object> pObj = GetObjectBodyInternal( + pObjList, objnum, gennum, true, ParseType::kLoose); if (!pObj) { if (parse_type == ParseType::kLoose) continue; @@ -487,7 +487,9 @@ std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObjectInternal( dwSignValuePos) { AutoRestorer<FX_FILESIZE> save_pos(&m_Pos); m_Pos = dwSignValuePos; - pDict->SetFor("Contents", GetObject(pObjList, objnum, gennum, false)); + pDict->SetFor("Contents", + GetObjectBodyInternal(pObjList, objnum, gennum, false, + ParseType::kLoose)); } FX_FILESIZE SavedPos = m_Pos; @@ -504,14 +506,14 @@ std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObjectInternal( return nullptr; } -std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObjectForStrict( +std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObjectBodyForStrict( CPDF_IndirectObjectHolder* pObjList, uint32_t objnum, uint32_t gennum, bool bDecrypt) { const CPDF_ReadValidator::Session read_session(GetValidator().Get()); - auto result = - GetObjectInternal(pObjList, objnum, gennum, bDecrypt, ParseType::kStrict); + auto result = GetObjectBodyInternal(pObjList, objnum, gennum, bDecrypt, + ParseType::kStrict); if (GetValidator()->has_read_problems()) return nullptr; return result; @@ -549,8 +551,8 @@ std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetIndirectObject( return nullptr; } - std::unique_ptr<CPDF_Object> pObj = - GetObjectInternal(pObjList, objnum, parser_gennum, bDecrypt, parse_type); + std::unique_ptr<CPDF_Object> pObj = GetObjectBodyInternal( + pObjList, objnum, parser_gennum, bDecrypt, parse_type); if (pObj) { if (!objnum) pObj->m_ObjNum = parser_objnum; |