diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-04-18 19:44:30 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-18 19:44:30 +0000 |
| commit | 24582d2c000f11ed4bfcb2579b79d10afc809062 (patch) | |
| tree | f29ca1621ea70b9ea92d2f78b31c85b55a58a485 /fxjs/cjs_publicmethods.cpp | |
| parent | 9e625db795ca7e112d692bda7200b69a873d75f7 (diff) | |
| download | pdfium-24582d2c000f11ed4bfcb2579b79d10afc809062.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>
(cherry picked from commit 3d523e3cf89440e2ffc6571b1c687ad5e3f0318f)
Reviewed-on: https://pdfium-review.googlesource.com/30950
Diffstat (limited to 'fxjs/cjs_publicmethods.cpp')
| -rw-r--r-- | fxjs/cjs_publicmethods.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fxjs/cjs_publicmethods.cpp b/fxjs/cjs_publicmethods.cpp index 8dc69c4a00..375eb6fd88 100644 --- a/fxjs/cjs_publicmethods.cpp +++ b/fxjs/cjs_publicmethods.cpp @@ -10,7 +10,6 @@ #include <cmath> #include <cwctype> #include <iomanip> -#include <iterator> #include <limits> #include <sstream> #include <string> @@ -1095,12 +1094,10 @@ CJS_Return CJS_PublicMethods::AFPercent_Format( if (iDec2 < 0) { ByteString zeros; - { - pdfium::span<char> zeros_ptr = zeros.GetBuffer(abs(iDec2)); - std::fill(std::begin(zeros_ptr), std::end(zeros_ptr), '0'); - } - zeros.ReleaseBuffer(abs(iDec2)); + char* zeros_ptr = zeros.GetBuffer(abs(iDec2)); + memset(zeros_ptr, '0', abs(iDec2)); strValue = zeros + strValue; + iDec2 = 0; } int iMax = strValue.GetLength(); |