From d8f0393f0f9d99e8012e01e6d1343053cb659fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Fri, 6 Mar 2020 07:46:36 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@908 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/core/pichar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src_main/core/pichar.cpp b/src_main/core/pichar.cpp index 4a092787..2ef2d832 100644 --- 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)); }