diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-04-22 12:29:21 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-04-22 12:29:21 -0700 |
commit | b208774174e102da9f218d89bf8a3af7a0e37f09 (patch) | |
tree | b2f345fb8c42b54008af9e06bcde1cfeff380acb /core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp | |
parent | 8f608d9c0d09ab5fc19cfb4a9d5d8ccef3de6625 (diff) | |
download | pdfium-b208774174e102da9f218d89bf8a3af7a0e37f09.tar.xz |
Merge to XFA: Add missing operators for CFX_xxxString combo patch.
This pulls in:
Review URL: https://codereview.chromium.org/1099193002
Review URL: https://codereview.chromium.org/1090303003
Review URL: https://codereview.chromium.org/1084293003
Review URL: https://codereview.chromium.org/1099213002
Plus one fix to an XFA file to fix compilation.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1095893005
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp index b45e23467f..cc517dd4c2 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp @@ -2562,7 +2562,7 @@ FX_BOOL CPDF_SyntaxParser::SearchWord(FX_BSTR tag, FX_BOOL bWholeWord, FX_BOOL b if (!bForward) { offset = taglen - 1; } - FX_LPCBYTE tag_data = tag; + FX_LPCBYTE tag_data = tag.GetPtr(); FX_BYTE byte; while (1) { if (bForward) { @@ -2599,7 +2599,7 @@ FX_BOOL CPDF_SyntaxParser::SearchWord(FX_BSTR tag, FX_BOOL bWholeWord, FX_BOOL b } } FX_FILESIZE startpos = bForward ? pos - taglen + 1 : pos; - if (!bWholeWord || IsWholeWord(startpos, limit, tag, taglen)) { + if (!bWholeWord || IsWholeWord(startpos, limit, tag.GetPtr(), taglen)) { m_Pos = startpos; return TRUE; } |