diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-09 14:54:41 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-09 17:47:30 (GMT) |
| commit | 1c5da7207a21cc44a4a08d291c290ffcd9b958fd (patch) | |
| tree | 20041e6e1b8482a38dae3e7e58ad5c5ca0bdf125 /tests/auto/qimage | |
| parent | bae78d4a2cc32952a19e4da9f0486af635ea6d47 (diff) | |
| download | Qt-1c5da7207a21cc44a4a08d291c290ffcd9b958fd.zip Qt-1c5da7207a21cc44a4a08d291c290ffcd9b958fd.tar.gz Qt-1c5da7207a21cc44a4a08d291c290ffcd9b958fd.tar.bz2 | |
Prevent crash in OpenGL engine when scaling images / pixmaps.
Make sure the resulting image / pixmap is valid if the source was valid.
Task-number: QTBUG-19157
Reviewed-by: Kim
Reviewed-by: Benjamin Poulain
Diffstat (limited to 'tests/auto/qimage')
| -rw-r--r-- | tests/auto/qimage/tst_qimage.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/qimage/tst_qimage.cpp b/tests/auto/qimage/tst_qimage.cpp index 558dfaa..6bb08b0 100644 --- a/tests/auto/qimage/tst_qimage.cpp +++ b/tests/auto/qimage/tst_qimage.cpp @@ -144,6 +144,7 @@ private slots: void rgbSwapped(); void deepCopyWhenPaintingActive(); + void scaled_QTBUG19157(); }; tst_QImage::tst_QImage() @@ -1902,5 +1903,12 @@ void tst_QImage::deepCopyWhenPaintingActive() QVERIFY(copy != image); } +void tst_QImage::scaled_QTBUG19157() +{ + QImage foo(5000, 1, QImage::Format_RGB32); + foo = foo.scaled(1024, 1024, Qt::KeepAspectRatio); + QVERIFY(!foo.isNull()); +} + QTEST_MAIN(tst_QImage) #include "tst_qimage.moc" |