cpp/openttd-patchpack/source Changeset - r24757:b17cade5850e

Changeset - r24757:b17cade5850e

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

Michael Lutz - 3 years ago 2021-01-04 14:20:34
michi@icosahedron.de

Codechange: OS-specific data for font search is not used outside of searching.

4 files changed with 2 insertions and 9 deletions:

src/fontcache.h

src/fontdetection.cpp

src/strings.cpp

src/textfile_gui.cpp

0 comments (0 inline, 0 general)

src/fontcache.h

➞

Show inline comments

@@ @@ -217,7 +217,7 @@ struct FreeTypeSubSetting { @@
 	uint size;           ///< The (requested) size of the font.
 	bool aa;             ///< Whether to do anti aliasing or not.
 	const void *os_handle = nullptr; ///< Optional native OS font info.
+	const void *os_handle = nullptr; ///< Optional native OS font info. Only valid during font search.
 };
 /** Settings for the freetype fonts. */

src/fontdetection.cpp

➞

Show inline comments

@@ @@ -344,9 +344,7 @@ static int CALLBACK EnumFontCallback(con @@
 	const char *english_name = font_name;
 #endif /* WITH_FREETYPE */
 	PLOGFONT os_data = MallocT<LOGFONT>(1);
 	*os_data = logfont->elfLogFont;
 	info->callback->SetFontNames(info->settings, font_name, os_data);
 	info->callback->SetFontNames(info->settings, font_name, &logfont->elfLogFont);
 	if (info->callback->FindMissingGlyphs()) return 1;
 	DEBUG(freetype, 1, "Fallback font: %s (%s)", font_name, english_name);
 	return 0; // stop enumerating

src/strings.cpp

➞

Show inline comments

@@ @@ -2078,7 +2078,6 @@ class LanguagePackGlyphSearcher : public @@
 		strecpy(settings->medium.font, font_name, lastof(settings->medium.font));
 		strecpy(settings->large.font,  font_name, lastof(settings->large.font));
 		free(settings->medium.os_handle); // Only free one, they are all the same pointer.
 		settings->small.os_handle = os_data;
 		settings->medium.os_handle = os_data;
 		settings->large.os_handle = os_data;
@@ @@ -2116,9 +2115,6 @@ void CheckForMissingGlyphs(bool base_fon @@
 		bad_font = !SetFallbackFont(&_freetype, _langpack.langpack->isocode, _langpack.langpack->winlangid, searcher);
 		free(_freetype.mono.os_handle);
 		free(_freetype.medium.os_handle);
 		memcpy(&_freetype, &backup, sizeof(backup));
 		if (!bad_font) {

src/textfile_gui.cpp

➞

Show inline comments

@@ @@ -196,7 +196,6 @@ void TextfileWindow::SetupScrollbars() @@
+{
 #if defined(WITH_FREETYPE) || defined(_WIN32)
 	strecpy(settings->mono.font, font_name, lastof(settings->mono.font));
 	free(settings->mono.os_handle);
 	settings->mono.os_handle = os_data;
 #endif
+}

0 comments (0 inline, 0 general)