diff options
author | Tom Sepez <tsepez@chromium.org> | 2018-04-16 17:28:17 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-16 17:28:17 +0000 |
commit | 3d523e3cf89440e2ffc6571b1c687ad5e3f0318f (patch) | |
tree | b546904778c288c9ee9100f8e9da2761a9acc2cb /core/fpdfapi/parser/fpdf_parser_decode.cpp | |
parent | c51196cac2963d94cb0c6434f870fcea83d5c509 (diff) | |
download | pdfium-3d523e3cf89440e2ffc6571b1c687ad5e3f0318f.tar.xz |
Revert "Return pdfium::span<char> from ByteString::GetBuffer()."
This reverts commit 80a6cbe0a427e155de8555bc867af745d10f9777.
Reason for revert: too many abrts in beta branch.
TBR: dsinclair@chromium.org
Bug: 832557, 832978, 832992, 833062, 833097
Change-Id: I7d511dbb224ddc644be96ea2f3770ad6f73debf5
Reviewed-on: https://pdfium-review.googlesource.com/30792
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser/fpdf_parser_decode.cpp')
-rw-r--r-- | core/fpdfapi/parser/fpdf_parser_decode.cpp | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/core/fpdfapi/parser/fpdf_parser_decode.cpp b/core/fpdfapi/parser/fpdf_parser_decode.cpp index 2fdc4daa49..90dca2edcb 100644 --- a/core/fpdfapi/parser/fpdf_parser_decode.cpp +++ b/core/fpdfapi/parser/fpdf_parser_decode.cpp @@ -469,22 +469,20 @@ ByteString PDF_EncodeText(const wchar_t* pString, int len) { if (len == -1) len = wcslen(pString); - int i; ByteString result; - { - pdfium::span<char> dest_buf = result.GetBuffer(len); - for (i = 0; i < len; ++i) { - int code; - for (code = 0; code < 256; ++code) { - if (PDFDocEncoding[code] == pString[i]) - break; - } - - if (code == 256) + char* dest_buf1 = result.GetBuffer(len); + int i; + for (i = 0; i < len; ++i) { + int code; + for (code = 0; code < 256; ++code) { + if (PDFDocEncoding[code] == pString[i]) break; - - dest_buf[i] = code; } + + if (code == 256) + break; + + dest_buf1[i] = code; } result.ReleaseBuffer(i); if (i == len) @@ -495,18 +493,15 @@ ByteString PDF_EncodeText(const wchar_t* pString, int len) { return result; } - size_t dest_index = 0; - size_t encLen = len * 2 + 2; - { - pdfium::span<char> cspan = result.GetBuffer(encLen); - auto dest_buf = pdfium::make_span(reinterpret_cast<uint8_t*>(cspan.data()), - cspan.size()); - dest_buf[dest_index++] = 0xfe; - dest_buf[dest_index++] = 0xff; - for (int j = 0; j < len; ++j) { - dest_buf[dest_index++] = pString[j] >> 8; - dest_buf[dest_index++] = static_cast<uint8_t>(pString[j]); - } + int encLen = len * 2 + 2; + + uint8_t* dest_buf2 = reinterpret_cast<uint8_t*>(result.GetBuffer(encLen)); + dest_buf2[0] = 0xfe; + dest_buf2[1] = 0xff; + dest_buf2 += 2; + for (int j = 0; j < len; ++j) { + *dest_buf2++ = pString[j] >> 8; + *dest_buf2++ = static_cast<uint8_t>(pString[j]); } result.ReleaseBuffer(encLen); return result; |