diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-04-07 13:56:13 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-07 21:16:15 +0000 |
| commit | c4a2b7518949df00651aa3513c93079f1968441e (patch) | |
| tree | 6befb2de2d0b8222cbc68f3c1cee99a20bea1cd0 /core/fpdfapi/parser/cpdf_syntax_parser.cpp | |
| parent | 1835a6fb98286817cdf656f4d1e223bd85ee378f (diff) | |
| download | pdfium-c4a2b7518949df00651aa3513c93079f1968441e.tar.xz | |
Cleanup string passing in core/fpdf*
Return strings where possible.
Add missing consts to strings passed by ref.
Convert non-const cases to pointers.
Rename a few methods to be clearer.
Change-Id: I86569bc1744f539e6dd67fc73649b272c016328c
Reviewed-on: https://pdfium-review.googlesource.com/3951
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser/cpdf_syntax_parser.cpp')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_syntax_parser.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/fpdfapi/parser/cpdf_syntax_parser.cpp b/core/fpdfapi/parser/cpdf_syntax_parser.cpp index 73bf56d206..1c84b859db 100644 --- a/core/fpdfapi/parser/cpdf_syntax_parser.cpp +++ b/core/fpdfapi/parser/cpdf_syntax_parser.cpp @@ -405,13 +405,13 @@ std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObject( if (word == "(") { CFX_ByteString str = ReadString(); if (m_pCryptoHandler && bDecrypt) - m_pCryptoHandler->Decrypt(objnum, gennum, str); + str = m_pCryptoHandler->Decrypt(objnum, gennum, str); return pdfium::MakeUnique<CPDF_String>(m_pPool, str, false); } if (word == "<") { CFX_ByteString str = ReadHexString(); if (m_pCryptoHandler && bDecrypt) - m_pCryptoHandler->Decrypt(objnum, gennum, str); + str = m_pCryptoHandler->Decrypt(objnum, gennum, str); return pdfium::MakeUnique<CPDF_String>(m_pPool, str, true); } if (word == "[") { @@ -526,17 +526,17 @@ std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObjectForStrict( if (word == "(") { CFX_ByteString str = ReadString(); if (m_pCryptoHandler) - m_pCryptoHandler->Decrypt(objnum, gennum, str); + str = m_pCryptoHandler->Decrypt(objnum, gennum, str); return pdfium::MakeUnique<CPDF_String>(m_pPool, str, false); } if (word == "<") { CFX_ByteString str = ReadHexString(); if (m_pCryptoHandler) - m_pCryptoHandler->Decrypt(objnum, gennum, str); + str = m_pCryptoHandler->Decrypt(objnum, gennum, str); return pdfium::MakeUnique<CPDF_String>(m_pPool, str, true); } if (word == "[") { - std::unique_ptr<CPDF_Array> pArray = pdfium::MakeUnique<CPDF_Array>(); + auto pArray = pdfium::MakeUnique<CPDF_Array>(); while (std::unique_ptr<CPDF_Object> pObj = GetObject(pObjList, objnum, gennum, true)) { pArray->Add(std::move(pObj)); |