diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2016-03-03 17:12:58 -0500 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2016-03-03 17:12:58 -0500 |
| commit | 1c91537c9f9669246713a5be628493ae2fc4899a (patch) | |
| tree | b40c06fde5dd0410f4eb7a0734f11758aa6c5d37 /core/src/fpdfapi/fpdf_parser | |
| parent | 44beca7313284a60c21b4973d42f993b8c248ec9 (diff) | |
| download | pdfium-1c91537c9f9669246713a5be628493ae2fc4899a.tar.xz | |
Combine StrToInt methods.
This Cl combines the two StrToInt implementations. In doing so I had to add
some more overrides to toDecimalDigit() and add a isDecimalDigit().
BUG=pdfium:423
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1757283002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser')
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp index 16d1134cb1..737bbe49be 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp @@ -208,12 +208,12 @@ CPDF_Parser::Error CPDF_Parser::StartParse(IFX_FileRead* pFileAccess) { if (!m_Syntax.GetCharAt(5, ch)) return FORMAT_ERROR; if (std::isdigit(ch)) - m_FileVersion = FXSYS_toDecimalDigit(ch) * 10; + m_FileVersion = FXSYS_toDecimalDigit(static_cast<FX_WCHAR>(ch)) * 10; if (!m_Syntax.GetCharAt(7, ch)) return FORMAT_ERROR; if (std::isdigit(ch)) - m_FileVersion += FXSYS_toDecimalDigit(ch); + m_FileVersion += FXSYS_toDecimalDigit(static_cast<FX_WCHAR>(ch)); if (m_Syntax.m_FileLen < m_Syntax.m_HeaderOffset + 9) return FORMAT_ERROR; @@ -669,7 +669,7 @@ FX_BOOL CPDF_Parser::RebuildCrossRef() { if (std::isdigit(byte)) { start_pos = pos + i; state = ParserState::kObjNum; - objnum = FXSYS_toDecimalDigit(byte); + objnum = FXSYS_toDecimalDigit(static_cast<FX_WCHAR>(byte)); } else if (byte == 't') { state = ParserState::kTrailer; inside_index = 1; @@ -684,7 +684,8 @@ FX_BOOL CPDF_Parser::RebuildCrossRef() { case ParserState::kObjNum: if (std::isdigit(byte)) { - objnum = objnum * 10 + FXSYS_toDecimalDigit(byte); + objnum = + objnum * 10 + FXSYS_toDecimalDigit(static_cast<FX_WCHAR>(byte)); } else if (PDFCharIsWhitespace(byte)) { state = ParserState::kPostObjNum; } else { @@ -698,7 +699,7 @@ FX_BOOL CPDF_Parser::RebuildCrossRef() { if (std::isdigit(byte)) { start_pos1 = pos + i; state = ParserState::kGenNum; - gennum = FXSYS_toDecimalDigit(byte); + gennum = FXSYS_toDecimalDigit(static_cast<FX_WCHAR>(byte)); } else if (byte == 't') { state = ParserState::kTrailer; inside_index = 1; @@ -710,7 +711,8 @@ FX_BOOL CPDF_Parser::RebuildCrossRef() { case ParserState::kGenNum: if (std::isdigit(byte)) { - gennum = gennum * 10 + FXSYS_toDecimalDigit(byte); + gennum = + gennum * 10 + FXSYS_toDecimalDigit(static_cast<FX_WCHAR>(byte)); } else if (PDFCharIsWhitespace(byte)) { state = ParserState::kPostGenNum; } else { @@ -725,7 +727,7 @@ FX_BOOL CPDF_Parser::RebuildCrossRef() { inside_index = 1; } else if (std::isdigit(byte)) { objnum = gennum; - gennum = FXSYS_toDecimalDigit(byte); + gennum = FXSYS_toDecimalDigit(static_cast<FX_WCHAR>(byte)); start_pos = start_pos1; start_pos1 = pos + i; state = ParserState::kGenNum; @@ -1876,7 +1878,7 @@ CFX_ByteString CPDF_SyntaxParser::ReadString() { break; case 1: if (ch >= '0' && ch <= '7') { - iEscCode = FXSYS_toDecimalDigit(ch); + iEscCode = FXSYS_toDecimalDigit(static_cast<FX_WCHAR>(ch)); status = 2; break; } @@ -1901,7 +1903,8 @@ CFX_ByteString CPDF_SyntaxParser::ReadString() { break; case 2: if (ch >= '0' && ch <= '7') { - iEscCode = iEscCode * 8 + FXSYS_toDecimalDigit(ch); + iEscCode = + iEscCode * 8 + FXSYS_toDecimalDigit(static_cast<FX_WCHAR>(ch)); status = 3; } else { buf.AppendChar(iEscCode); @@ -1911,7 +1914,8 @@ CFX_ByteString CPDF_SyntaxParser::ReadString() { break; case 3: if (ch >= '0' && ch <= '7') { - iEscCode = iEscCode * 8 + FXSYS_toDecimalDigit(ch); + iEscCode = + iEscCode * 8 + FXSYS_toDecimalDigit(static_cast<FX_WCHAR>(ch)); buf.AppendChar(iEscCode); status = 0; } else { |