From 528b4172f095cd5aa8a924087f32b696217790e6 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 27 Jun 2020 16:19:46 +0000 Subject: [PATCH] replace qt_x11ft_convert_pattern() with its body Signed-off-by: Ivailo Monev --- src/gui/text/qfontengine_x11.cpp | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/src/gui/text/qfontengine_x11.cpp b/src/gui/text/qfontengine_x11.cpp index 5c21954cb..ed7f4d848 100644 --- a/src/gui/text/qfontengine_x11.cpp +++ b/src/gui/text/qfontengine_x11.cpp @@ -189,34 +189,23 @@ void QFontEngineMultiFT::loadEngine(int at) // ------------------------------------------------------------------ // X11 FT engine // ------------------------------------------------------------------ - - - -static void qt_x11ft_convert_pattern(FcPattern *pattern, QByteArray *file_name, int *index, bool *antialias) -{ - FcChar8 *fileName; - FcPatternGetString(pattern, FC_FILE, 0, &fileName); - *file_name = (const char *)fileName; - if (!FcPatternGetInteger(pattern, FC_INDEX, 0, index)) - index = 0; - FcBool b; - if (FcPatternGetBool(pattern, FC_ANTIALIAS, 0, &b) == FcResultMatch) - *antialias = b; -} - - QFontEngineX11FT::QFontEngineX11FT(FcPattern *pattern, const QFontDef &fd, int screen) : QFontEngineFT(fd) { // FcPatternPrint(pattern); - bool antialias = qt_x11Data->fc_antialias; - QByteArray file_name; - int face_index; - qt_x11ft_convert_pattern(pattern, &file_name, &face_index, &antialias); QFontEngine::FaceId face_id; - face_id.filename = file_name; - face_id.index = face_index; + FcChar8 *fileName; + FcBool antiAlias; + + FcPatternGetString(pattern, FC_FILE, 0, &fileName); + face_id.filename = (const char *)fileName; + + if (!FcPatternGetInteger(pattern, FC_INDEX, 0, &face_id.index)) + face_id.index = 0; + + if (FcPatternGetBool(pattern, FC_ANTIALIAS, 0, &antiAlias) == FcResultMatch) + antialias = antiAlias; canUploadGlyphsToServer = QApplication::testAttribute(Qt::AA_X11InitThreads) || (qApp->thread() == QThread::currentThread()); -- 2.11.0