From b08bf6d2a1523ed1fc56afd92be7e283a48abe4a Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 26 Dec 2021 12:17:59 +0200 Subject: [PATCH] replace QFreetypeFace::computeSize() with its body Signed-off-by: Ivailo Monev --- src/gui/text/qfontengine_ft.cpp | 9 ++------- src/gui/text/qfontengine_ft_p.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index 86284a648..15ffd7230 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -157,12 +157,6 @@ HB_Error QFreetypeFace::getPointInOutline(HB_Glyph glyph, int flags, hb_uint32 p return HB_Err_Ok; } -void QFreetypeFace::computeSize(const QFontDef &fontDef, int *xsize, int *ysize) -{ - *ysize = qRound(fontDef.pixelSize * 64); - *xsize = *ysize * fontDef.stretch / 100; -} - QFontEngine::Properties QFreetypeFace::properties() const { QFontEngine::Properties p; @@ -324,7 +318,8 @@ bool QFontEngineFT::init(FaceId faceId) face_id = faceId; lbearing = rbearing = SHRT_MIN; - freetype->computeSize(fontDef, &xsize, &ysize); + ysize = qRound(fontDef.pixelSize * 64); + xsize = (ysize * fontDef.stretch / 100); FT_Face face = getFace(); // fake italic/oblique diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h index f0309cb1f..1692c36d3 100644 --- a/src/gui/text/qfontengine_ft_p.h +++ b/src/gui/text/qfontengine_ft_p.h @@ -61,7 +61,6 @@ public: QFreetypeFace(const QFontEngine::FaceId &face_id); ~QFreetypeFace(); - void computeSize(const QFontDef &fontDef, int *xsize, int *ysize); QFontEngine::Properties properties() const; FT_Face face;