diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-12 09:35:52 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-12 08:32:00 +0000 |
| commit | 59d4cbca0b232814b736b7543ddecd5e5db40c29 (patch) | |
| tree | 19b39cbff4f34b79a0e33edeeaff9b02ae9c0502 /src/platformsupport/fontdatabases | |
| parent | e45516ea0d41f215cddf1a51efe15998c74817a9 (diff) | |
QWindowsFontEngineDirectWrite: Fix build with MinGW
In member function 'void tn::QWindowsFontEngineDirectWrite::collectMetrics()':
windows\qwindowsfontenginedirectwrite.cpp:361:22: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare]
if (table.size() >= advanceWidthMaxLocation + sizeof(quint16)) {
^
Amends 17fc188aec5806167d3c6165b0ad299a8d2a6bcf.
Task-number: QTBUG-58954
Change-Id: Ice2ff135d411b55d32290069b3c85ca0b5ea09af
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/platformsupport/fontdatabases')
| -rw-r--r-- | src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp index 6f2755a05a..f07e711048 100644 --- a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp +++ b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp @@ -358,7 +358,7 @@ void QWindowsFontEngineDirectWrite::collectMetrics() QByteArray table = getSfntTable(MAKE_TAG('h', 'h', 'e', 'a')); const int advanceWidthMaxLocation = 10; - if (table.size() >= advanceWidthMaxLocation + sizeof(quint16)) { + if (table.size() >= advanceWidthMaxLocation + int(sizeof(quint16))) { quint16 advanceWidthMax = qFromBigEndian<quint16>(table.constData() + advanceWidthMaxLocation); m_maxAdvanceWidth = DESIGN_TO_LOGICAL(advanceWidthMax); } |