diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-05-28 16:41:49 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-03 15:14:42 +0200 |
| commit | e4079eca49adce16e31dac2a18d49d7a55817891 (patch) | |
| tree | 1dfb960ec1115b1f552afe8a013058542389505e /src/gui/painting/qpaintengine_raster_p.h | |
| parent | f32a6cfb6b6236533508901f114ab57396da8ff3 (diff) | |
| parent | ec6dc5f78453048c4f0604655a34c6c20c79d819 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Take 5.
Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3
Diffstat (limited to 'src/gui/painting/qpaintengine_raster_p.h')
| -rw-r--r-- | src/gui/painting/qpaintengine_raster_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h index 500e0fae54..ec4a35087a 100644 --- a/src/gui/painting/qpaintengine_raster_p.h +++ b/src/gui/painting/qpaintengine_raster_p.h @@ -434,7 +434,7 @@ public: QImage::Format prepare(QImage *image); - uchar *scanLine(int y) { Q_ASSERT(y>=0); Q_ASSERT(y<m_height); return m_buffer + y * bytes_per_line; } + uchar *scanLine(int y) { Q_ASSERT(y>=0); Q_ASSERT(y<m_height); return m_buffer + y * qsizetype(bytes_per_line); } int width() const { return m_width; } int height() const { return m_height; } |