diff options
author | Caolán McNamara <caolanm@redhat.com> | 2022-08-26 14:59:26 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2022-08-26 18:11:51 +0200 |
commit | ba9c6ad27d76de2cc4bc43cc2836a9680a3e1a9b (patch) | |
tree | 1adb93e6fda153d9849c28d729446efc6a2cd0fe /vcl/unx/generic | |
parent | 5c0ac89bfe0e412fa335b562e63e380f0be14cd9 (diff) |
freetype 2.9 was relesed in Jan 2018, drop workaround for <= 2.8
Change-Id: Iaf95faa15d56e8f26ed57cb4744b039a18223c5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138877
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx/generic')
-rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 34 |
2 files changed, 0 insertions, 36 deletions
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index 006ea2ce8d4a..5ddee651d70e 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -205,8 +205,6 @@ void CairoTextRender::DrawTextLayout(const GenericSalLayout& rLayout, const SalG } int nRatio = nWidth * 10 / nHeight; - if (FreetypeFont::AlmostHorizontalDrainsRenderingPool(nRatio, rFSD)) - return; /* * It might be ideal to cache surface and cairo context between calls and diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 848405169cd2..c9c471144bd3 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -313,40 +313,6 @@ void FreetypeManager::InitFreetype() nDefaultPrioAntiAlias = pEnv[0] - '0'; } -namespace -{ - bool DoesAlmostHorizontalDrainRenderingPool() - { - FT_Int nMajor, nMinor, nPatch; - FT_Library_Version(aLibFT, &nMajor, &nMinor, &nPatch); - if (nMajor > 2) - return false; - if (nMajor == 2 && nMinor <= 8) - return true; - return false; - } -} - -bool FreetypeFont::AlmostHorizontalDrainsRenderingPool(int nRatio, const vcl::font::FontSelectPattern& rFSD) -{ - static bool bAlmostHorizontalDrainsRenderingPool = DoesAlmostHorizontalDrainRenderingPool(); - if (nRatio > 100 && rFSD.maTargetName == "OpenSymbol" && bAlmostHorizontalDrainsRenderingPool) - { - // tdf#127189 FreeType <= 2.8 will fail to render stretched horizontal - // brace glyphs in starmath at a fairly low stretch ratio. The failure - // will set CAIRO_STATUS_FREETYPE_ERROR on the surface which cannot be - // cleared, so all further painting to the surface fails. - - // This appears fixed in >= freetype 2.9 - - // Restrict this bodge to a stretch ratio > ~10 of the OpenSymbol font - // where it has been seen in practice. - SAL_WARN("vcl", "rendering text would fail with stretch ratio of: " << nRatio << ", with FreeType <= 2.8"); - return true; - } - return false; -} - FT_Face FreetypeFont::GetFtFace() const { FT_Activate_Size( maSizeFT ); |