Remove UTF8 <-> EUC conversion functions.

BUG=#252 TEST=unittest REF_BUG=19010851 REF_CL=84862327
google · Oct 25, 2015 · 26f4380 · 26f4380
1 parent 8ea8133
commit 26f4380
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 20 deletions.
diff --git a/src/base/encoding_util.cc b/src/base/encoding_util.cc
@@ -101,8 +101,6 @@ static int GetCodepage(const char* name) {
   } kCodePageMap[] = {
     { "UTF8",      CP_UTF8 },  // Unicode UTF-8
     { "SJIS",      932     },  // ANSI/OEM - Japanese, Shift-JIS
-    { "EUC-JP-MS", 51932   },  // EUC - Japanese
-    { "JIS",       20932   },  // JIS X 0208-1990 & 0212-1990
   };
 
   for (size_t i = 0; i < arraysize(kCodePageMap); i++) {
@@ -166,17 +164,6 @@ inline bool Convert(const char *from, const char *to,
 
 namespace mozc {
 
-#ifndef OS_WIN
-// The following functions don't work on Windows
-void EncodingUtil::UTF8ToEUC(const string &input, string *output) {
-  Convert("UTF8", "EUC-JP-MS", input, output);
-}
-
-void EncodingUtil::EUCToUTF8(const string &input, string *output) {
-  Convert("EUC-JP-MS", "UTF8", input, output);
-}
-#endif  // OS_WIN
-
 void EncodingUtil::UTF8ToSJIS(const string &input, string *output) {
   Convert("UTF8", "SJIS", input, output);
 }

diff --git a/src/base/encoding_util.h b/src/base/encoding_util.h
@@ -41,12 +41,6 @@ namespace mozc {
 
 class EncodingUtil {
  public:
-#ifndef OS_WIN
-  // The following functions don't work on Windows.
-  static void UTF8ToEUC(const string &input, string *output);
-  static void EUCToUTF8(const string &input, string *output);
-#endif  // OS_WIN
-
   static void UTF8ToSJIS(const string &input, string *output);
   static void SJISToUTF8(const string &input, string *output);
 

diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=17
-BUILD=2140
+BUILD=2141
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.