zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-28 23:02:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix "unexpected end of TTF file" error

Browse source 
Changed returnv vector size to 3 by default and set size 5 for WIN32
only.
This commit is contained in:
Andrey Shustov 2024-01-11 07:02:23 +03:00 committed by Christoph Oelckers
parent 64096658e5
commit 0aa140194d
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common/widgets/widgetresourcedata.cpp
View file

@ -54,7 +54,7 @@ std::vector<SingleFontData> LoadWidgetFontData(const std::string& name)
std::vector<SingleFontData> returnv; std::vector<SingleFontData> returnv;
if (!stricmp(name.c_str(), "notosans")) if (!stricmp(name.c_str(), "notosans"))
{ {
returnv.resize(5); returnv.resize(3);
returnv[0].fontdata = LoadFile("widgets/noto/notosans-regular.ttf"); returnv[0].fontdata = LoadFile("widgets/noto/notosans-regular.ttf");
returnv[1].fontdata = LoadFile("widgets/noto/notosansarmenian-regular.ttf"); returnv[1].fontdata = LoadFile("widgets/noto/notosansarmenian-regular.ttf");
returnv[2].fontdata = LoadFile("widgets/noto/notosansgeorgian-regular.ttf"); returnv[2].fontdata = LoadFile("widgets/noto/notosansgeorgian-regular.ttf");
@ -62,6 +62,7 @@ std::vector<SingleFontData> LoadWidgetFontData(const std::string& name)
wchar_t wbuffer[256]; wchar_t wbuffer[256];
if (GetWindowsDirectoryW(wbuffer, 256)) if (GetWindowsDirectoryW(wbuffer, 256))
{ {
returnv.resize(5);
FString windir(wbuffer); FString windir(wbuffer);
returnv[3].fontdata = LoadDiskFile((windir + "/fonts/yugothm.ttc").GetChars()); returnv[3].fontdata = LoadDiskFile((windir + "/fonts/yugothm.ttc").GetChars());
returnv[3].language = "ja"; returnv[3].language = "ja";