From 8a1758bf11c2d741e0cddc761b1dd2cdf564db93 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Tue, 15 Aug 2017 10:37:59 -0400 Subject: 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 Reviewed-by: Tom Sepez --- fxbarcode/oned/BC_OnedCode39Writer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'fxbarcode/oned/BC_OnedCode39Writer.cpp') 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; } -- cgit v1.2.3