mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: font_win32.cpp compile failure with WITH_FREETYPE

pull/10052/head
Peter Nelson 2022-09-15 21:18:47 +01:00 committed by PeterN
parent 0c20a5f39f
commit 273988551d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/os/windows/font_win32.cpp
View File

@ -161,7 +161,7 @@ registry_no_font_found:
* @param logfont the font information to get the english name of. * @param logfont the font information to get the english name of.
* @return the English name (if it could be found). * @return the English name (if it could be found).
*/ */
static const char *GetEnglishFontName(const ENUMLOGFONTEX *logfont) static std::string GetEnglishFontName(const ENUMLOGFONTEX *logfont)
{ {
static char font_name[MAX_PATH]; static char font_name[MAX_PATH];
const char *ret_font_name = nullptr; const char *ret_font_name = nullptr;
@ -228,7 +228,7 @@ err2:
ReleaseDC(nullptr, dc); ReleaseDC(nullptr, dc);
DeleteObject(font); DeleteObject(font);
err1: err1:
return ret_font_name == nullptr ? FS2OTTD((const wchar_t *)logfont->elfFullName) : ret_font_name; return ret_font_name == nullptr ? FS2OTTD((const wchar_t *)logfont->elfFullName) : std::string(ret_font_name);
} }
#endif /* WITH_FREETYPE */ #endif /* WITH_FREETYPE */
@ -309,8 +309,8 @@ static int CALLBACK EnumFontCallback(const ENUMLOGFONTEX *logfont, const NEWTEXT
#ifdef WITH_FREETYPE #ifdef WITH_FREETYPE
/* Add english name after font name */ /* Add english name after font name */
const char *english_name = GetEnglishFontName(logfont); std::string english_name = GetEnglishFontName(logfont);
strecpy(font_name + strlen(font_name) + 1, english_name, lastof(font_name)); strecpy(font_name + strlen(font_name) + 1, english_name.c_str(), lastof(font_name));
/* Check whether we can actually load the font. */ /* Check whether we can actually load the font. */
bool ft_init = _library != nullptr; bool ft_init = _library != nullptr;