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/datamatrix/BC_EncoderContext.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'fxbarcode/datamatrix/BC_EncoderContext.cpp') diff --git a/fxbarcode/datamatrix/BC_EncoderContext.cpp b/fxbarcode/datamatrix/BC_EncoderContext.cpp index 404c07d980..eaf3768f49 100644 --- a/fxbarcode/datamatrix/BC_EncoderContext.cpp +++ b/fxbarcode/datamatrix/BC_EncoderContext.cpp @@ -36,8 +36,8 @@ CBC_EncoderContext::CBC_EncoderContext(const CFX_WideString& msg, CFX_WideString sb; FX_STRSIZE c = dststr.GetLength(); for (FX_STRSIZE i = 0; i < c; i++) { - wchar_t ch = static_cast(dststr.GetAt(i) & 0xff); - if (ch == '?' && dststr.GetAt(i) != '?') { + wchar_t ch = static_cast(dststr[i] & 0xff); + if (ch == '?' && dststr[i] != '?') { e = BCExceptionCharactersOutsideISO88591Encoding; } sb += ch; @@ -60,10 +60,10 @@ void CBC_EncoderContext::setSkipAtEnd(int32_t count) { m_skipAtEnd = count; } wchar_t CBC_EncoderContext::getCurrentChar() { - return m_msg.GetAt(m_pos); + return m_msg[m_pos]; } wchar_t CBC_EncoderContext::getCurrent() { - return m_msg.GetAt(m_pos); + return m_msg[m_pos]; } void CBC_EncoderContext::writeCodewords(const CFX_WideString& codewords) { -- cgit v1.2.3