From 6b0d9e1ac03ec06bcca92620f74e542b1e6a8772 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 9 Apr 2021 15:11:26 +1000 Subject: Bug [#2243]. Fix crash when technology=2 (SC_TECHNOLOGY_DIRECTWRITERETAIN). --- doc/ScintillaHistory.html | 4 ++++ win32/PlatWin.cxx | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index e145fff81..24b2ead5a 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -629,6 +629,10 @@ Bug #2238.
  • + On Win32, fix crash with SC_TECHNOLOGY_DIRECTWRITERETAIN. + Bug #2243. +
  • +
  • On GTK, changes in system font settings (such as from Tweak) are detected and position caches are invalidated since different font display options, such as antialiasing, change character shape and thus positions. diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 8c7a9adb9..30d72dd4b 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -365,7 +365,7 @@ struct FontDirectWrite : public FontWin { std::shared_ptr Font::Allocate(const FontParameters &fp) { #if defined(USE_D2D) - if (fp.technology == SCWIN_TECH_DIRECTWRITE) { + if (fp.technology != SCWIN_TECH_GDI) { return std::make_shared(fp); } #endif -- cgit v1.2.3