Skip to content

Commit 26f4380

Browse files
Noriyuki Takahashiyukawa
Noriyuki Takahashi
authored andcommitted
Remove UTF8 <-> EUC conversion functions.
BUG=#252 TEST=unittest REF_BUG=19010851 REF_CL=84862327
1 parent 8ea8133 commit 26f4380

File tree

3 files changed

+1
-20
lines changed

3 files changed

+1
-20
lines changed

src/base/encoding_util.cc

-13
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ static int GetCodepage(const char* name) {
101101
} kCodePageMap[] = {
102102
{ "UTF8", CP_UTF8 }, // Unicode UTF-8
103103
{ "SJIS", 932 }, // ANSI/OEM - Japanese, Shift-JIS
104-
{ "EUC-JP-MS", 51932 }, // EUC - Japanese
105-
{ "JIS", 20932 }, // JIS X 0208-1990 & 0212-1990
106104
};
107105

108106
for (size_t i = 0; i < arraysize(kCodePageMap); i++) {
@@ -166,17 +164,6 @@ inline bool Convert(const char *from, const char *to,
166164

167165
namespace mozc {
168166

169-
#ifndef OS_WIN
170-
// The following functions don't work on Windows
171-
void EncodingUtil::UTF8ToEUC(const string &input, string *output) {
172-
Convert("UTF8", "EUC-JP-MS", input, output);
173-
}
174-
175-
void EncodingUtil::EUCToUTF8(const string &input, string *output) {
176-
Convert("EUC-JP-MS", "UTF8", input, output);
177-
}
178-
#endif // OS_WIN
179-
180167
void EncodingUtil::UTF8ToSJIS(const string &input, string *output) {
181168
Convert("UTF8", "SJIS", input, output);
182169
}

src/base/encoding_util.h

-6
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ namespace mozc {
4141

4242
class EncodingUtil {
4343
public:
44-
#ifndef OS_WIN
45-
// The following functions don't work on Windows.
46-
static void UTF8ToEUC(const string &input, string *output);
47-
static void EUCToUTF8(const string &input, string *output);
48-
#endif // OS_WIN
49-
5044
static void UTF8ToSJIS(const string &input, string *output);
5145
static void SJISToUTF8(const string &input, string *output);
5246

src/mozc_version_template.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MAJOR=2
22
MINOR=17
3-
BUILD=2140
3+
BUILD=2141
44
REVISION=102
55
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
66
# downloaded by NaCl Mozc.

0 commit comments

Comments
 (0)