SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

PIString and PIChar fixes 4

Browse Source
This commit is contained in:
Andrey
2022-03-25 15:10:29 +03:00
parent 7dee8f6313
commit 4c7df57e66
3 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/main/core/pichar.cpp
View File

@@ -339,7 +339,7 @@ PIChar PIChar::toUpper() const {
UChar c(0);
UErrorCode e((UErrorCode)0);
u_strToUpper(&c, 1, (const UChar*)(&ch), 1, 0, &e);
return PIChar(c);
return PIChar((ushort)c);
#else
# ifdef WINDOWS
ushort wc = 0;
@@ -357,7 +357,7 @@ PIChar PIChar::toLower() const {
UChar c(0);
UErrorCode e((UErrorCode)0);
u_strToLower(&c, 1, (const UChar*)(&ch), 1, 0, &e);
return PIChar(c);
return PIChar((ushort)c);
#else
# ifdef WINDOWS
ushort wc = 0;

4
libs/main/core/pistring.cpp
View File

@@ -263,12 +263,12 @@ void PIString::appendFromChars(const char * c, int s, const char * codepage) {
UChar * ucs = new UChar[s];
memset(ucs, 0, s * sizeof(UChar));
e = (UErrorCode)0;
int sz = ucnv_toUChars(cc, ucs, s, c, s, &e);
sz = ucnv_toUChars(cc, ucs, s, c, s, &e);
//printf("appendFromChars %d -> %d\n", s, sz);
//printf("PIString %d -> %d\n", c[0], ucs[0]);
reserve(size_s() + sz);
for (int i = 0; i < sz; ++i) {
push_back(PIChar(ucs[i]));
push_back(PIChar((ushort)ucs[i]));
}
delete[] ucs;
ucnv_close(cc);