diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-08-11 14:03:35 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-08-16 19:09:29 +0200 |
| commit | b35176f43a953d56380414f05834c7918762cb83 (patch) | |
| tree | 862704f91ddd337cffc2af7cd5b5f5121f9229b2 | |
| parent | ef4a999a9f098f4013759422e6a1dfb8c32c1180 (diff) | |
Support autohint and lcdfilter fontconfig configuration
This patch adds support for reading autohint and lcdfilter settings
from fontconfig and pass them on to freetype.
Task-number: QTBUG-32254
Change-Id: Iaa69b70f7005ee7f21126a8d984c07b3a46a3e7f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| -rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 4 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_ft_p.h | 1 | ||||
| -rw-r--r-- | src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp | 20 |
3 files changed, 25 insertions, 0 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index ad4276bf5c..eef316b039 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -678,6 +678,7 @@ QFontEngineFT::QFontEngineFT(const QFontDef &fd) const QByteArray env = qgetenv("QT_NO_FT_CACHE"); cacheEnabled = env.isEmpty() || env.toInt() == 0; m_subPixelPositionCount = 4; + forceAutoHint = false; } QFontEngineFT::~QFontEngineFT() @@ -832,6 +833,9 @@ int QFontEngineFT::loadFlags(QGlyphSet *set, GlyphFormat format, int flags, else load_flags |= load_target; + if (forceAutoHint) + load_flags |= FT_LOAD_FORCE_AUTOHINT; + return load_flags; } diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h index ba603b9192..09c70c5083 100644 --- a/src/gui/text/qfontengine_ft_p.h +++ b/src/gui/text/qfontengine_ft_p.h @@ -307,6 +307,7 @@ protected: int lcdFilterType; bool embeddedbitmap; bool cacheEnabled; + bool forceAutoHint; private: friend class QFontEngineFTRawFont; diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp index 33fe7d8583..7b5f882982 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp +++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp @@ -624,6 +624,16 @@ QFontEngine *QFontconfigDatabase::fontEngine(const QFontDef &f, void *usrPtr) if (match) { engine->setDefaultHintStyle(defaultHintStyleFromMatch((QFont::HintingPreference)f.hintingPreference, match)); + FcBool fc_autohint; + if (FcPatternGetBool(match, FC_AUTOHINT,0, &fc_autohint) == FcResultMatch) + engine->forceAutoHint = fc_autohint; + +#if defined(FT_LCD_FILTER_H) + int lcdFilter; + if (FcPatternGetInteger(match, FC_LCD_FILTER, 0, &lcdFilter) == FcResultMatch) + engine->lcdFilterType = lcdFilter; +#endif + if (antialias) { // If antialiasing is not fully disabled, fontconfig may still disable it on a font match basis. FcBool fc_antialias; @@ -685,6 +695,16 @@ QFontEngine *QFontconfigDatabase::fontEngine(const QByteArray &fontData, qreal p if (match) { engine->setDefaultHintStyle(defaultHintStyleFromMatch(hintingPreference, match)); + FcBool fc_autohint; + if (FcPatternGetBool(match, FC_AUTOHINT,0, &fc_autohint) == FcResultMatch) + engine->forceAutoHint = fc_autohint; + +#if defined(FT_LCD_FILTER_H) + int lcdFilter; + if (FcPatternGetInteger(match, FC_LCD_FILTER, 0, &lcdFilter) == FcResultMatch) + engine->lcdFilterType = lcdFilter; +#endif + FcBool fc_antialias; if (FcPatternGetBool(match, FC_ANTIALIAS,0, &fc_antialias) != FcResultMatch) fc_antialias = true; |