summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp')
-rw-r--r--src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
index 910a16bf95..1c9a17a3e4 100644
--- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
+++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
@@ -1243,6 +1243,10 @@ int QFontEngineFT::synthesized() const
void QFontEngineFT::initializeHeightMetrics() const
{
+ m_ascent = QFixed::fromFixed(metrics.ascender);
+ m_descent = QFixed::fromFixed(-metrics.descender);
+ m_leading = QFixed::fromFixed(metrics.height - metrics.ascender + metrics.descender);
+
QFontEngine::initializeHeightMetrics();
if (scalableBitmapScaleFactor != 1) {
@@ -1252,17 +1256,6 @@ void QFontEngineFT::initializeHeightMetrics() const
}
}
-bool QFontEngineFT::processHheaTable() const
-{
- if (!QFontEngine::processHheaTable()) {
- m_ascent = QFixed::fromFixed(metrics.ascender);
- m_descent = QFixed::fromFixed(-metrics.descender);
- m_leading = QFixed::fromFixed(metrics.height - metrics.ascender + metrics.descender);
- }
-
- return true;
-}
-
QFixed QFontEngineFT::capHeight() const
{
TT_OS2 *os2 = (TT_OS2 *)FT_Get_Sfnt_Table(freetype->face, ft_sfnt_os2);