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/qrcode | |
| 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/qrcode')
| -rw-r--r-- | fxbarcode/qrcode/BC_QRCoderEncoder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/fxbarcode/qrcode/BC_QRCoderEncoder.cpp index f779ed4b95..911730fbe5 100644 --- a/fxbarcode/qrcode/BC_QRCoderEncoder.cpp +++ b/fxbarcode/qrcode/BC_QRCoderEncoder.cpp @@ -134,7 +134,7 @@ void Append8BitBytes(const CFX_ByteString& content, CBC_QRCoderBitVector* bits, CFX_ByteString encoding, int32_t& e) { - for (int32_t i = 0; i < content.GetLength(); i++) + for (FX_STRSIZE i = 0; i < content.GetLength(); i++) bits->AppendBits(content[i], 8); } @@ -425,7 +425,7 @@ void MergeString(std::vector<ModeStringPair>* result, void SplitString(const CFX_ByteString& content, std::vector<ModeStringPair>* result) { - int32_t index = 0; + FX_STRSIZE index = 0; while (index < content.GetLength()) { uint8_t c = static_cast<uint8_t>(content[index]); if (!((c >= 0xA1 && c <= 0xAA) || (c >= 0xB0 && c <= 0xFA))) @@ -437,7 +437,7 @@ void SplitString(const CFX_ByteString& content, if (index >= content.GetLength()) return; - int32_t flag = index; + FX_STRSIZE flag = index; while (GetAlphaNumericCode(content[index]) == -1 && index < content.GetLength()) { uint8_t c = static_cast<uint8_t>(content[index]); @@ -491,7 +491,7 @@ CBC_QRCoderMode* ChooseMode(const CFX_ByteString& content, bool hasNumeric = false; bool hasAlphaNumeric = false; - for (int32_t i = 0; i < content.GetLength(); i++) { + for (FX_STRSIZE i = 0; i < content.GetLength(); i++) { if (isdigit(content[i])) { hasNumeric = true; } else if (GetAlphaNumericCode(content[i]) != -1) { |