diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-03 16:25:39 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-03 16:25:39 (GMT) |
| commit | ac0a7503d58946b38d4d18bb077dd9530ccbb6f9 (patch) | |
| tree | 3e16b713e0269147f9d362e7c1384768e98b2c1e /src/gui/text/qfontdatabase_mac.cpp | |
| parent | bf0926fff333398660fd51ae6b08699783100057 (diff) | |
| parent | 399782c7911c11bba80dd37276f8de0b171c52f8 (diff) | |
| download | Qt-ac0a7503d58946b38d4d18bb077dd9530ccbb6f9.zip Qt-ac0a7503d58946b38d4d18bb077dd9530ccbb6f9.tar.gz Qt-ac0a7503d58946b38d4d18bb077dd9530ccbb6f9.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/text/qfontdatabase_mac.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase_mac.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase_mac.cpp b/src/gui/text/qfontdatabase_mac.cpp index ad2c1b2..5ba236b 100644 --- a/src/gui/text/qfontdatabase_mac.cpp +++ b/src/gui/text/qfontdatabase_mac.cpp @@ -72,7 +72,7 @@ static void initWritingSystems(QtFontFamily *family, ATSFontRef atsFont) qFromBigEndian<quint32>(os2Table.data() + 54) }; quint32 codePageRange[2] = { qFromBigEndian<quint32>(os2Table.data() + 78), qFromBigEndian<quint32>(os2Table.data() + 82) }; - QList<QFontDatabase::WritingSystem> systems = determineWritingSystemsFromTrueTypeBits(unicodeRange, codePageRange); + QList<QFontDatabase::WritingSystem> systems = qt_determine_writing_systems_from_truetype_bits(unicodeRange, codePageRange); #if 0 QCFString name; ATSFontGetName(atsFont, kATSOptionFlagsDefault, &name); @@ -244,6 +244,11 @@ static const char *styleHint(const QFontDef &request) return stylehint; } +static inline float weightToFloat(unsigned int weight) +{ + return (weight - 50) / 100.0; +} + void QFontDatabase::load(const QFontPrivate *d, int script) { // sanity checks |