diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2017-08-29 16:39:44 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-30 14:35:33 +0000 |
| commit | aa3a9cd82df9dff1ef136797259e606a39c18b75 (patch) | |
| tree | 5ca71f96fa289c5f13d22b371341882b77c7331f /fxbarcode/oned/BC_OnedCode128Writer.cpp | |
| parent | 980a3ea30872cef9ada360aa85e7c3573d7668b5 (diff) | |
| download | pdfium-aa3a9cd82df9dff1ef136797259e606a39c18b75.tar.xz | |
Convert int* references to FX_STRSIZE
Through out the code base there are numerous places where variables
are declared using a signed integer type when interacting with the
string classes, since they assume that FX_STRSIZE is 'int'. As part of
changing the underling type of FX_STRSIZE to be unsigned, these
locations are being changed to use FX_STRSIZE. This is necessary as
part of converting the type, but has been broken off into a separate CL,
since it should be low risk.
Some related cleanups that are low risk are included as part of
this CL.
BUG=pdfium:828
Change-Id: Ifaae54ad195ccde0fe8672f71271d29a6ebd65fd
Reviewed-on: https://pdfium-review.googlesource.com/12210
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'fxbarcode/oned/BC_OnedCode128Writer.cpp')
| -rw-r--r-- | fxbarcode/oned/BC_OnedCode128Writer.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fxbarcode/oned/BC_OnedCode128Writer.cpp b/fxbarcode/oned/BC_OnedCode128Writer.cpp index a6dc749a76..1e9f98b9e7 100644 --- a/fxbarcode/oned/BC_OnedCode128Writer.cpp +++ b/fxbarcode/oned/BC_OnedCode128Writer.cpp @@ -96,7 +96,7 @@ bool CBC_OnedCode128Writer::CheckContentValidity( CFX_WideString CBC_OnedCode128Writer::FilterContents( const CFX_WideStringC& contents) { CFX_WideString filterChineseChar; - for (int32_t i = 0; i < contents.GetLength(); i++) { + for (FX_STRSIZE i = 0; i < contents.GetLength(); i++) { wchar_t ch = contents[i]; if (ch > 175) { i++; @@ -173,9 +173,8 @@ int32_t CBC_OnedCode128Writer::Encode128B(const CFX_ByteString& contents, int32_t checkWeight = 1; patterns->push_back(CODE_START_B); int32_t checkSum = CODE_START_B * checkWeight; - int32_t position = 0; - while (position < contents.GetLength()) { - int32_t patternIndex = contents[position++] - ' '; + for (FX_STRSIZE position = 0; position < contents.GetLength(); position++) { + int32_t patternIndex = contents[position] - ' '; patterns->push_back(patternIndex); checkSum += patternIndex * checkWeight++; } @@ -188,13 +187,13 @@ int32_t CBC_OnedCode128Writer::Encode128C(const CFX_ByteString& contents, int32_t checkWeight = 1; patterns->push_back(CODE_START_C); int32_t checkSum = CODE_START_C * checkWeight; - int32_t position = 0; + FX_STRSIZE position = 0; while (position < contents.GetLength()) { int32_t patternIndex; char ch = contents[position]; if (std::isdigit(ch)) { patternIndex = FXSYS_atoi( - contents.Mid(position, position + 1 < contents.GetLength() ? 2 : 1) + contents.Mid(position, contents.IsValidIndex(position + 1) ? 2 : 1) .c_str()); ++position; if (position < contents.GetLength() && std::isdigit(contents[position])) |