1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle wide images in raster engine

Browse Source 
QImages internally use a qsizetype bytes_per_line, so should
QRasterBuffer, even if this won't be relevant until Qt 6.

Task-number: QTBUG-73731
Fixes: QTBUG-75082
Change-Id: Id296795d54f3ff36c48c1ebae0594a72b8e33b52
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
This commit is contained in:
Allan Sandfeld Jensen 2019-02-11 11:02:15 +01:00
parent f3ecda32e0
commit 85e3e88e1e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/painting/qpaintengine_raster_p.h
View File

@ -434,14 +434,14 @@ public:
QImage::Format prepare(QImage *image);
uchar *scanLine(int y) { Q_ASSERT(y>=0); Q_ASSERT(y<m_height); return m_buffer + y * qsizetype(bytes_per_line); }
uchar *scanLine(int y) { Q_ASSERT(y>=0); Q_ASSERT(y<m_height); return m_buffer + y * bytes_per_line; }
int width() const { return m_width; }
int height() const { return m_height; }
int bytesPerLine() const { return bytes_per_line; }
qsizetype bytesPerLine() const { return bytes_per_line; }
int bytesPerPixel() const { return bytes_per_pixel; }
template<typename T>
int stride() { return bytes_per_line / sizeof(T); }
int stride() { return static_cast<int>(bytes_per_line / sizeof(T)); }
uchar *buffer() const { return m_buffer; }
@ -456,7 +456,7 @@ public:
private:
int m_width;
int m_height;
int bytes_per_line;
qsizetype bytes_per_line;
int bytes_per_pixel;
uchar *m_buffer;
};