Skip to content

Fix #3 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
V10lator wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix #3 #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e049594
Fix #3
V10lator Apr 26, 2020
6679433
Remove useless codes
V10lator Apr 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions source/gui/FreeTypeGX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,16 @@ FreeTypeGX::~FreeTypeGX() {
wchar_t* FreeTypeGX::charToWideChar(const char* strChar) {
if (!strChar) return NULL;

wchar_t *strWChar = new (std::nothrow) wchar_t[strlen(strChar) + 1];
size_t len = strlen(strChar) + 1;
wchar_t *strWChar = new (std::nothrow) wchar_t[len];
if (!strWChar) return NULL;

int32_t bt = mbstowcs(strWChar, strChar, strlen(strChar));
if (bt > 0) {
strWChar[bt] = 0;
return strWChar;
}
size_t bt = mbstowcs(strWChar, strChar, len);
if (bt == (size_t)-1)
return NULL;

wchar_t *tempDest = strWChar;
while ((*tempDest++ = *strChar++))
;
if (bt < --len)
strWChar[bt] = 0;

return strWChar;
}
Expand Down Expand Up @@ -130,6 +128,7 @@ char *FreeTypeGX::wideCharToUTF8(const wchar_t* strChar) {
pOut[n++] = (char)((wc & 0x3F) | 0x80);
}
}
pOut[n] = '\0';
return pOut;
}

Expand Down