git-svn-id: svn://db.shs.com.ru/pip@908 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

2020-03-06 07:46:36 +00:00
parent 4803b416f5
commit d8f0393f0f
1 changed files with 2 additions and 2 deletions
--- a/src_main/core/pichar.cpp
+++ b/src_main/core/pichar.cpp
@@ -81,8 +81,8 @@ ushort charFromCodepage(const char * c, int size, const char * codepage, int * t
 	mbtowc(0, 0, 0); // reset mbtowc
 	ret = mbtowc(&wc, c, size);
 	printf("mbtowc = %d\n", ret);
-	if (ret < 1 || ret > (int)sizeof(ushort)) return 0;
-	return wc;
+	if (ret < 1) return 0;
+	return ushort(int(wc));
 }