diff options
| author | Michael Lutz <michi@icosahedron.de> | 2021-01-06 22:56:44 +0100 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2021-02-13 20:09:14 +0100 |
| commit | 5ad16409847a17534389054a1b7f5fb83703fb4d (patch) | |
| tree | 83fc638e56b16c9fa561ed3551e2d83d7c701dfa /src | |
| parent | 2b0200d4297a67916cf3b955adc474e88e327cf0 (diff) | |
| download | openttd-5ad16409847a17534389054a1b7f5fb83703fb4d.tar.xz | |
Codechange: Make OS font handle of the FontCache read-only.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fontcache.cpp | 2 | ||||
| -rw-r--r-- | src/fontcache.h | 2 | ||||
| -rw-r--r-- | src/os/windows/string_uniscribe.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/fontcache.cpp b/src/fontcache.cpp index 0b2764aab..9cdc0b975 100644 --- a/src/fontcache.cpp +++ b/src/fontcache.cpp @@ -756,7 +756,7 @@ public: virtual GlyphID MapCharToGlyph(WChar key); virtual const char *GetFontName() { return WIDE_TO_MB(this->logfont.lfFaceName); } virtual bool IsBuiltInFont() { return false; } - virtual void *GetOSHandle() { return &this->logfont; } + virtual const void *GetOSHandle() { return &this->logfont; } }; diff --git a/src/fontcache.h b/src/fontcache.h index 4c44876da..fac08a353 100644 --- a/src/fontcache.h +++ b/src/fontcache.h @@ -127,7 +127,7 @@ public: * Get the native OS font handle, if there is one. * @return Opaque OS font handle. */ - virtual void *GetOSHandle() + virtual const void *GetOSHandle() { return nullptr; } diff --git a/src/os/windows/string_uniscribe.cpp b/src/os/windows/string_uniscribe.cpp index ad3754866..6c0a9366e 100644 --- a/src/os/windows/string_uniscribe.cpp +++ b/src/os/windows/string_uniscribe.cpp @@ -144,7 +144,7 @@ void UniscribeResetScriptCache(FontSize size) /** Load the matching native Windows font. */ static HFONT HFontFromFont(Font *font) { - if (font->fc->GetOSHandle() != nullptr) return CreateFontIndirect((PLOGFONT)font->fc->GetOSHandle()); + if (font->fc->GetOSHandle() != nullptr) return CreateFontIndirect((const PLOGFONT)font->fc->GetOSHandle()); LOGFONT logfont; ZeroMemory(&logfont, sizeof(LOGFONT)); |