diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-01-28 13:52:29 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-10-27 06:18:52 +0000 |
| commit | d9beeb65f9b30e33cdb54eef355b851f11f13e90 (patch) | |
| tree | 8e40f41b15ec425330d94f841955e34995210b69 /src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp | |
| parent | ef43195617de505d49137ebb46df2b2ddc7bc3d8 (diff) | |
Direct2d: Fix some CLANG warnings
Fix warnings about integer and double to float conversions, mostly.
Change-Id: I7c0568051eabea9af9cbdaeb36da0b2affb174e1
Reviewed-by: Louai Al-Khanji <louai.al-khanji@qt.io>
Diffstat (limited to 'src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp index deabe98fbe..4905cc79a0 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp @@ -106,13 +106,14 @@ public: if (_tcscat_s(filename, bufSize, __TEXT("\\d2d1.dll")) == 0) { DWORD versionInfoSize = GetFileVersionInfoSize(filename, NULL); if (versionInfoSize) { - QVector<BYTE> info(versionInfoSize); + QVector<BYTE> info(static_cast<int>(versionInfoSize)); if (GetFileVersionInfo(filename, NULL, versionInfoSize, info.data())) { UINT size; DWORD *fi; - if (VerQueryValue(info.constData(), __TEXT("\\"), (LPVOID *) &fi, &size) && size) { - VS_FIXEDFILEINFO *verInfo = (VS_FIXEDFILEINFO *) fi; + if (VerQueryValue(info.constData(), __TEXT("\\"), + reinterpret_cast<void **>(&fi), &size) && size) { + const VS_FIXEDFILEINFO *verInfo = reinterpret_cast<const VS_FIXEDFILEINFO *>(fi); return Direct2DVersion(HIWORD(verInfo->dwFileVersionMS), LOWORD(verInfo->dwFileVersionMS), HIWORD(verInfo->dwFileVersionLS), |