diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-27 15:34:10 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-27 15:34:10 +0200 |
| commit | 518cf3312c101ea1c5ae5199611ebda46a74dadd (patch) | |
| tree | fe580d423d8938caad9d6705c7ef9da13d2d8e14 /src/gui/painting/qpaintengine_raster_p.h | |
| parent | 59937de098dd86472e73146bd0c84e980022e24d (diff) | |
| parent | 65cfac73bd1c09eafadf57a3b7161f52b186c37d (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ia279fc4a8226626041c772902a07b2f90f37b53b
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; } |