From 166610ff02810e3412c348629862424373676c03 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 20 Jan 2012 16:46:06 -0200 Subject: Compile in C++11 mode: narrowing conversion problems Matches qtbase commit a13b17e42a7ca146ec9503285df546d4ade22c91 Change-Id: Ie554499f40c03c715d527f2c1624b97fafe5ce8c Reviewed-by: Eskil Abrahamsen Blomfeldt --- .../platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp b/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp index f9a4306..cabc4c6 100644 --- a/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp +++ b/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp @@ -301,10 +301,11 @@ QStringList QBasicUnixFontDatabase::addTTFile(const QByteArray &fontData, const TT_OS2 *os2 = (TT_OS2 *)FT_Get_Sfnt_Table(face, ft_sfnt_os2); if (os2) { quint32 unicodeRange[4] = { - os2->ulUnicodeRange1, os2->ulUnicodeRange2, os2->ulUnicodeRange3, os2->ulUnicodeRange4 + quint32(os2->ulUnicodeRange1), quint32(os2->ulUnicodeRange2), + quint32(os2->ulUnicodeRange3), quint32(os2->ulUnicodeRange4) }; quint32 codePageRange[2] = { - os2->ulCodePageRange1, os2->ulCodePageRange2 + quint32(os2->ulCodePageRange1), quint32(os2->ulCodePageRange2) }; writingSystems = determineWritingSystemsFromTrueTypeBits(unicodeRange, codePageRange); -- cgit v0.12