diff options
| author | Fredrik Orderud <forderud@gmail.com> | 2015-09-17 14:38:52 +0200 |
|---|---|---|
| committer | Fredrik Orderud <forderud@gmail.com> | 2015-09-21 12:00:34 +0000 |
| commit | 3b54c5bfc17f91ce175b7b2d05482f48c514a15e (patch) | |
| tree | c117d44e71e1b71b828e237987d0f7f239a3caef /src/render/io | |
| parent | 07f43b6213f2a3f612be3dd957317781ed830c85 (diff) | |
Assert on packed input data in TexImageData::setImage.
Task-number: QTBUG-48330
Change-Id: Ib31ff05c434d75b3533bc9b4b1879bc907320555
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/io')
| -rw-r--r-- | src/render/io/texturedata.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/render/io/texturedata.cpp b/src/render/io/texturedata.cpp index df224ab35..c0aafff02 100644 --- a/src/render/io/texturedata.cpp +++ b/src/render/io/texturedata.cpp @@ -75,6 +75,7 @@ void TexImageData::setImage(const QImage &image) m_depth = 1; QImage glImage = image.convertToFormat(QImage::Format_RGBA8888); + Q_ASSERT_X(glImage.bytesPerLine() == (glImage.width() * glImage.depth() + 7) / 8, "TexImageData::setImage", "glImage is not packed"); // QTBUG-48330 QByteArray imageBytes((const char*) glImage.constBits(), glImage.byteCount()); setData(imageBytes, QOpenGLTexture::RGBA, QOpenGLTexture::UInt8); m_format = QOpenGLTexture::RGBA8_UNorm; |