diff options
| author | Lei Zhang <thestig@chromium.org> | 2016-01-06 01:52:42 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2016-01-06 01:52:42 -0800 |
| commit | ec32127b105fc1ff74842dc939cb6fa7d23430b0 (patch) | |
| tree | 84beb10b61a7a16b4ab83567a32e4e9212695a62 /core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp | |
| parent | c5b40ba5c4f993fa2445ad7db0c98de80aa43514 (diff) | |
| download | pdfium-ec32127b105fc1ff74842dc939cb6fa7d23430b0.tar.xz | |
Merge to XFA: Change CPDF_SyntaxParser::GetNextWord() to not pass by non-const ref.
Change the internal version to GetNextWordInternal().
TBR=weili@chromium.org
Review URL: https://codereview.chromium.org/1558083002 .
(cherry picked from commit 61197421793e24add7a250d3f15ab83dc75f80c6)
Review URL: https://codereview.chromium.org/1561093002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp index d0154d118e..f36313e1dc 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp @@ -46,15 +46,15 @@ void CFDF_Document::ParseStream(IFX_FileRead* pFile, FX_BOOL bOwnFile) { CPDF_SyntaxParser parser; parser.InitParser(m_pFile, 0); while (1) { - FX_BOOL bNumber; - CFX_ByteString word = parser.GetNextWord(bNumber); + bool bNumber; + CFX_ByteString word = parser.GetNextWord(&bNumber); if (bNumber) { FX_DWORD objnum = FXSYS_atoi(word); - word = parser.GetNextWord(bNumber); + word = parser.GetNextWord(&bNumber); if (!bNumber) { break; } - word = parser.GetNextWord(bNumber); + word = parser.GetNextWord(nullptr); if (word != "obj") { break; } @@ -63,7 +63,7 @@ void CFDF_Document::ParseStream(IFX_FileRead* pFile, FX_BOOL bOwnFile) { break; } InsertIndirectObject(objnum, pObj); - word = parser.GetNextWord(bNumber); + word = parser.GetNextWord(nullptr); if (word != "endobj") { break; } |