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/qwindowsdirect2dbitmap.cpp | |
| parent | ef43195617de505d49137ebb46df2b2ddc7bc3d8 (diff) | |
| download | qtbase-d9beeb65f9b30e33cdb54eef355b851f11f13e90.tar.gz | |
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/qwindowsdirect2dbitmap.cpp')
| -rw-r--r-- | src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp index b5065ba380..57491cb5b0 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp @@ -55,8 +55,9 @@ class QWindowsDirect2DBitmapPrivate { public: QWindowsDirect2DBitmapPrivate(ID2D1DeviceContext *dc = 0, ID2D1Bitmap1 *bm = 0) - : bitmap(bm) - , deviceContext(new QWindowsDirect2DDeviceContext(dc)) + : deviceContext(new QWindowsDirect2DDeviceContext(dc)) + , bitmap(bm) + { deviceContext->get()->SetTarget(bm); } @@ -83,7 +84,7 @@ public: UINT32(width), UINT32(height) }; - HRESULT hr = deviceContext->get()->CreateBitmap(size, data, pitch, + HRESULT hr = deviceContext->get()->CreateBitmap(size, data, UINT32(pitch), bitmapProperties(), bitmap.ReleaseAndGetAddressOf()); if (SUCCEEDED(hr)) @@ -128,7 +129,7 @@ public: } return QImage(static_cast<const uchar *>(mappedRect.bits), - size.width, size.height, mappedRect.pitch, + int(size.width), int(size.height), int(mappedRect.pitch), QImage::Format_ARGB32_Premultiplied).copy(rect); } @@ -197,7 +198,7 @@ QSize QWindowsDirect2DBitmap::size() const Q_D(const QWindowsDirect2DBitmap); D2D1_SIZE_U size = d->bitmap->GetPixelSize(); - return QSize(size.width, size.height); + return QSize(int(size.width), int(size.height)); } QT_END_NAMESPACE |
