AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid fontconfig access in fontEngine creation

Browse Source 
The only thing we need to know at fontEngine creation is the hinting
style, we can just store it in enumeration process and get it back
from user data pointer. So that fontEngines can be created without
access to fontconfig at all. (Since we are doing our own matching.)

Change-Id: I5ab2d1f27e28787447aedcbdef16555fb0f1b604
Reviewed-on: http://codereview.qt-project.org/4769
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
This commit is contained in:
Jiang Jiang 2011-09-13 13:33:44 +02:00 committed by Qt by Nokia
parent 81a5885814
commit 8dcb52df8e
2 changed files with 25 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/platformsupport/fontdatabases/basicunix/qbasicunixfontdatabase_p.h
View File

@ -50,6 +50,7 @@ struct FontFile
{ {
QString fileName; QString fileName;
int indexValue; int indexValue;
int hintStyle;
}; };
class QBasicUnixFontDatabase : public QPlatformFontDatabase class QBasicUnixFontDatabase : public QPlatformFontDatabase

67
src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
View File

@ -314,7 +314,7 @@ void QFontconfigDatabase::populateFontDatabase()
FC_FAMILY, FC_WEIGHT, FC_SLANT, FC_FAMILY, FC_WEIGHT, FC_SLANT,
FC_SPACING, FC_FILE, FC_INDEX, FC_SPACING, FC_FILE, FC_INDEX,
FC_LANG, FC_CHARSET, FC_FOUNDRY, FC_SCALABLE, FC_PIXEL_SIZE, FC_WEIGHT, FC_LANG, FC_CHARSET, FC_FOUNDRY, FC_SCALABLE, FC_PIXEL_SIZE, FC_WEIGHT,
FC_WIDTH, FC_WIDTH, FC_HINT_STYLE,
#if FC_VERSION >= 20297 #if FC_VERSION >= 20297
FC_CAPABILITY, FC_CAPABILITY,
#endif #endif
@ -404,9 +404,31 @@ void QFontconfigDatabase::populateFontDatabase()
} }
#endif #endif
QFontEngineFT::HintStyle default_hint_style;
// hinting
int hint_style = 0;
if (FcPatternGetInteger(fonts->fonts[i], FC_HINT_STYLE, 0, &hint_style) == FcResultNoMatch)
hint_style = QFontEngineFT::HintFull;
switch (hint_style) {
case FC_HINT_NONE:
default_hint_style = QFontEngineFT::HintNone;
break;
case FC_HINT_SLIGHT:
default_hint_style = QFontEngineFT::HintLight;
break;
case FC_HINT_MEDIUM:
default_hint_style = QFontEngineFT::HintMedium;
break;
default:
default_hint_style = QFontEngineFT::HintFull;
break;
}
FontFile *fontFile = new FontFile; FontFile *fontFile = new FontFile;
fontFile->fileName = QLatin1String((const char *)file_value); fontFile->fileName = QLatin1String((const char *)file_value);
fontFile->indexValue = indexValue; fontFile->indexValue = indexValue;
fontFile->hintStyle = default_hint_style;
QFont::Style style = (slant_value == FC_SLANT_ITALIC) QFont::Style style = (slant_value == FC_SLANT_ITALIC)
? QFont::StyleItalic ? QFont::StyleItalic
@ -479,48 +501,7 @@ QFontEngine *QFontconfigDatabase::fontEngine(const QFontDef &f, QUnicodeTables::
QFontEngineFT::GlyphFormat format = antialias? QFontEngineFT::Format_A8 : QFontEngineFT::Format_Mono; QFontEngineFT::GlyphFormat format = antialias? QFontEngineFT::Format_A8 : QFontEngineFT::Format_Mono;
engine = new QFontEngineFT(fontDef); engine = new QFontEngineFT(fontDef);
engine->setDefaultHintStyle(QFontEngineFT::HintStyle(fontfile->hintStyle));
// try and get the pattern
FcPattern *pattern = FcPatternCreate();
FcValue value;
value.type = FcTypeString;
QByteArray cs = fontDef.family.toUtf8();
value.u.s = (const FcChar8 *)cs.data();
FcPatternAdd(pattern,FC_FAMILY,value,true);
value.u.s = (const FcChar8 *)fid.filename.data();
FcPatternAdd(pattern,FC_FILE,value,true);
value.type = FcTypeInteger;
value.u.i = fid.index;
FcPatternAdd(pattern,FC_INDEX,value,true);
if (FcConfigSubstitute(0,pattern,FcMatchPattern)) {
QFontEngineFT::HintStyle default_hint_style;
//hinting
int hint_style = 0;
if (FcPatternGetInteger (pattern, FC_HINT_STYLE, 0, &hint_style) == FcResultNoMatch)
hint_style = QFontEngineFT::HintFull;
switch (hint_style) {
case FC_HINT_NONE:
default_hint_style = QFontEngineFT::HintNone;
break;
case FC_HINT_SLIGHT:
default_hint_style = QFontEngineFT::HintLight;
break;
case FC_HINT_MEDIUM:
default_hint_style = QFontEngineFT::HintMedium;
break;
default:
default_hint_style = QFontEngineFT::HintFull;
break;
}
engine->setDefaultHintStyle(default_hint_style);
}
FcPatternDestroy(pattern);
if (!engine->init(fid,antialias,format)) { if (!engine->init(fid,antialias,format)) {
delete engine; delete engine;