diff options
author | Ryan Harrison <rharrison@chromium.org> | 2017-08-15 10:37:59 -0400 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-15 15:03:10 +0000 |
commit | 8a1758bf11c2d741e0cddc761b1dd2cdf564db93 (patch) | |
tree | 82cbafc46f574a05ae0c1d1d3d7f9ebde6cb932d /fxbarcode/oned | |
parent | 171cb27a720036c48ae3a6176084e880742af0a9 (diff) | |
download | pdfium-8a1758bf11c2d741e0cddc761b1dd2cdf564db93.tar.xz |
Remove GetAt from string classes
This method duplicates the behaviour of the const [] operator and
doesn't offer any additional safety. Folding them into one
implementation.
SetAt is retained, since implementing the non-const [] operator to
replace SetAt has potential performance concerns. Specifically many
non-obvious cases of reading an element using [] will cause a realloc
& copy.
BUG=pdfium:860
Change-Id: I3ef5e5e5a15376f040256b646eb0d90636e24b67
Reviewed-on: https://pdfium-review.googlesource.com/10870
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxbarcode/oned')
-rw-r--r-- | fxbarcode/oned/BC_OnedCodaBarWriter.cpp | 4 | ||||
-rw-r--r-- | fxbarcode/oned/BC_OnedCode39Writer.cpp | 6 | ||||
-rw-r--r-- | fxbarcode/oned/BC_OnedEAN13Writer.cpp | 2 | ||||
-rw-r--r-- | fxbarcode/oned/BC_OnedEAN8Writer.cpp | 2 | ||||
-rw-r--r-- | fxbarcode/oned/BC_OnedUPCAWriter.cpp | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/fxbarcode/oned/BC_OnedCodaBarWriter.cpp b/fxbarcode/oned/BC_OnedCodaBarWriter.cpp index 14ffcdfc35..ecaeb8d656 100644 --- a/fxbarcode/oned/BC_OnedCodaBarWriter.cpp +++ b/fxbarcode/oned/BC_OnedCodaBarWriter.cpp @@ -106,7 +106,7 @@ CFX_WideString CBC_OnedCodaBarWriter::FilterContents( CFX_WideString filtercontents; wchar_t ch; for (int32_t index = 0; index < contents.GetLength(); index++) { - ch = contents.GetAt(index); + ch = contents[index]; if (ch > 175) { index++; continue; @@ -137,7 +137,7 @@ uint8_t* CBC_OnedCodaBarWriter::EncodeImpl(const CFX_ByteString& contents, char ch; int32_t position = 0; for (int32_t index = 0; index < data.GetLength(); index++) { - ch = data.GetAt(index); + ch = data[index]; if (((ch >= 'a') && (ch <= 'z'))) { ch = ch - 32; } diff --git a/fxbarcode/oned/BC_OnedCode39Writer.cpp b/fxbarcode/oned/BC_OnedCode39Writer.cpp index b9d594a028..cd87231fdf 100644 --- a/fxbarcode/oned/BC_OnedCode39Writer.cpp +++ b/fxbarcode/oned/BC_OnedCode39Writer.cpp @@ -50,7 +50,7 @@ CBC_OnedCode39Writer::~CBC_OnedCode39Writer() {} bool CBC_OnedCode39Writer::CheckContentValidity( const CFX_WideStringC& contents) { for (int32_t i = 0; i < contents.GetLength(); i++) { - wchar_t ch = contents.GetAt(i); + wchar_t ch = contents[i]; if ((ch >= (wchar_t)'0' && ch <= (wchar_t)'9') || (ch >= (wchar_t)'A' && ch <= (wchar_t)'Z') || ch == (wchar_t)'-' || ch == (wchar_t)'.' || ch == (wchar_t)' ' || ch == (wchar_t)'*' || @@ -67,7 +67,7 @@ CFX_WideString CBC_OnedCode39Writer::FilterContents( const CFX_WideStringC& contents) { CFX_WideString filtercontents; for (int32_t i = 0; i < contents.GetLength(); i++) { - wchar_t ch = contents.GetAt(i); + wchar_t ch = contents[i]; if (ch == (wchar_t)'*' && (i == 0 || i == contents.GetLength() - 1)) { continue; } @@ -92,7 +92,7 @@ CFX_WideString CBC_OnedCode39Writer::RenderTextContents( const CFX_WideStringC& contents) { CFX_WideString renderContents; for (int32_t i = 0; i < contents.GetLength(); i++) { - wchar_t ch = contents.GetAt(i); + wchar_t ch = contents[i]; if (ch == (wchar_t)'*' && (i == 0 || i == contents.GetLength() - 1)) { continue; } diff --git a/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/fxbarcode/oned/BC_OnedEAN13Writer.cpp index 6f1d957a01..85f545c602 100644 --- a/fxbarcode/oned/BC_OnedEAN13Writer.cpp +++ b/fxbarcode/oned/BC_OnedEAN13Writer.cpp @@ -64,7 +64,7 @@ CFX_WideString CBC_OnedEAN13Writer::FilterContents( CFX_WideString filtercontents; wchar_t ch; for (int32_t i = 0; i < contents.GetLength(); i++) { - ch = contents.GetAt(i); + ch = contents[i]; if (ch > 175) { i++; continue; diff --git a/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/fxbarcode/oned/BC_OnedEAN8Writer.cpp index 9a85f814a7..ae10fe52ef 100644 --- a/fxbarcode/oned/BC_OnedEAN8Writer.cpp +++ b/fxbarcode/oned/BC_OnedEAN8Writer.cpp @@ -70,7 +70,7 @@ CFX_WideString CBC_OnedEAN8Writer::FilterContents( CFX_WideString filtercontents; wchar_t ch; for (int32_t i = 0; i < contents.GetLength(); i++) { - ch = contents.GetAt(i); + ch = contents[i]; if (ch > 175) { i++; continue; diff --git a/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/fxbarcode/oned/BC_OnedUPCAWriter.cpp index 13514eb53f..fff4184221 100644 --- a/fxbarcode/oned/BC_OnedUPCAWriter.cpp +++ b/fxbarcode/oned/BC_OnedUPCAWriter.cpp @@ -43,7 +43,7 @@ CBC_OnedUPCAWriter::~CBC_OnedUPCAWriter() {} bool CBC_OnedUPCAWriter::CheckContentValidity(const CFX_WideStringC& contents) { for (FX_STRSIZE i = 0; i < contents.GetLength(); ++i) { - if (contents.GetAt(i) < '0' || contents.GetAt(i) > '9') + if (contents[i] < '0' || contents[i] > '9') return false; } return true; @@ -54,7 +54,7 @@ CFX_WideString CBC_OnedUPCAWriter::FilterContents( CFX_WideString filtercontents; wchar_t ch; for (int32_t i = 0; i < contents.GetLength(); i++) { - ch = contents.GetAt(i); + ch = contents[i]; if (ch > 175) { i++; continue; |