commit fbcc18aa2fb9b9bd60331a156ada37b3e2024be2
author Lei Zhang <thestig@chromium.org> Sat Nov 17 00:47:12 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Sat Nov 17 00:47:12 2018 +0000
tree 6d9c152e5ceba8934b388c0fccb5894502b5cefb
parent 19dd48c3d26b604ab58ba1dd3db7503ef015544b

Replace CBC_OneDimWriter::Upper() with FXSYS_ToUpperASCII().

Change-Id: I3a4c7c0db351fd534b1ec87035eeb292b638f7c6
Reviewed-on: https://pdfium-review.googlesource.com/c/45672
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

core/fxcrt/fx_extension.h

diff --git a/core/fxcrt/fx_extension.h b/core/fxcrt/fx_extension.h
index e14c980..2e46c26 100644
--- a/core/fxcrt/fx_extension.h
+++ b/core/fxcrt/fx_extension.h
@@ -48,6 +48,10 @@
   return u_toupper(c);
 }
 
+inline char FXSYS_ToUpperASCII(char c) {
+  return (c >= 'a' && c <= 'z') ? (c + ('A' - 'a')) : c;
+}
+
 inline bool FXSYS_iswalpha(wchar_t c) {
   return u_isalpha(c);
 }
@@ -71,7 +75,7 @@
 inline int FXSYS_HexCharToInt(char c) {
   if (!FXSYS_IsHexDigit(c))
     return 0;
-  char upchar = std::toupper(c);
+  char upchar = FXSYS_ToUpperASCII(c);
   return upchar > '9' ? upchar - 'A' + 10 : upchar - '0';
 }
 

fxbarcode/oned/BC_OneDimWriter.cpp

diff --git a/fxbarcode/oned/BC_OneDimWriter.cpp b/fxbarcode/oned/BC_OneDimWriter.cpp
index 34a5716..8630b36 100644
--- a/fxbarcode/oned/BC_OneDimWriter.cpp
+++ b/fxbarcode/oned/BC_OneDimWriter.cpp
@@ -70,13 +70,6 @@
   m_fontColor = color;
 }
 
-wchar_t CBC_OneDimWriter::Upper(wchar_t ch) {
-  if (ch >= 'a' && ch <= 'z') {
-    ch = ch - ('a' - 'A');
-  }
-  return ch;
-}
-
 uint8_t* CBC_OneDimWriter::EncodeWithHint(const ByteString& contents,
                                           BCFORMAT format,
                                           int32_t& outWidth,

fxbarcode/oned/BC_OneDimWriter.h

diff --git a/fxbarcode/oned/BC_OneDimWriter.h b/fxbarcode/oned/BC_OneDimWriter.h
index db801da..34048bc 100644
--- a/fxbarcode/oned/BC_OneDimWriter.h
+++ b/fxbarcode/oned/BC_OneDimWriter.h
@@ -79,7 +79,6 @@
                                 int32_t startColor,
                                 int32_t& e);
 
-  wchar_t Upper(wchar_t ch);
   void RenderVerticalBars(int32_t outputX, int32_t width, int32_t height);
 
   bool m_bPrintChecksum = true;

fxbarcode/oned/BC_OnedCode39Writer.cpp

diff --git a/fxbarcode/oned/BC_OnedCode39Writer.cpp b/fxbarcode/oned/BC_OnedCode39Writer.cpp
index d27c267..1174f94 100644
--- a/fxbarcode/oned/BC_OnedCode39Writer.cpp
+++ b/fxbarcode/oned/BC_OnedCode39Writer.cpp
@@ -82,7 +82,7 @@
       i++;
       continue;
     }
-    ch = Upper(ch);
+    ch = FXSYS_ToUpperASCII(ch);
     if (IsInOnedCode39Alphabet(ch))
       filtercontents += ch;
   }
@@ -101,7 +101,7 @@
       i++;
       continue;
     }
-    if (IsInOnedCode39Alphabet(Upper(ch)))
+    if (IsInOnedCode39Alphabet(FXSYS_ToUpperASCII(ch)))
       renderContents += ch;
   }
   return renderContents;