diff options
| author | Neil <nyamatongwe@gmail.com> | 2021-04-09 15:11:26 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2021-04-09 15:11:26 +1000 |
| commit | 6b0d9e1ac03ec06bcca92620f74e542b1e6a8772 (patch) | |
| tree | 7a0b654452ba7bfc651c3da90d3490f08da5ee48 | |
| parent | 04cea3a50855b43eb3febcbc39eaf9b24ea73abc (diff) | |
| download | scintilla-mirror-6b0d9e1ac03ec06bcca92620f74e542b1e6a8772.tar.gz | |
Bug [#2243]. Fix crash when technology=2 (SC_TECHNOLOGY_DIRECTWRITERETAIN).rel-5-0-1
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | win32/PlatWin.cxx | 2 |
2 files changed, 5 insertions, 1 deletions
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 @@ <a href="https://sourceforge.net/p/scintilla/bugs/2238/">Bug #2238</a>. </li> <li> + On Win32, fix crash with SC_TECHNOLOGY_DIRECTWRITERETAIN. + <a href="https://sourceforge.net/p/scintilla/bugs/2243/">Bug #2243</a>. + </li> + <li> 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> 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<FontDirectWrite>(fp); } #endif |