Don't crash when convert Indexed8 without colortable to QPixmap

This implicitly adds "grayscale" support for indexed 8, but
only for the conversion. The alternative would be leave the pixels
uninitialized which would be less nice...

Reviewed-by: Samuel

1 files changed, 29 insertions, 0 deletions

diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index 8dd5f5f..9422327 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -83,6 +83,9 @@ private slots:
     void fromImage_data();
     void fromImage();
 
+    void fromUninitializedImage_data();
+    void fromUninitializedImage();
+
     void convertFromImage_data();
     void convertFromImage();
 
@@ -266,6 +269,32 @@ void tst_QPixmap::fromImage()
     QCOMPARE(result, image);
 }
 
+
+void tst_QPixmap::fromUninitializedImage_data()
+{
+    QTest::addColumn<QImage::Format>("format");
+
+    QTest::newRow("Format_Mono") << QImage::Format_Mono;
+    QTest::newRow("Format_MonoLSB") << QImage::Format_MonoLSB;
+    QTest::newRow("Format_Indexed8") << QImage::Format_Indexed8;
+    QTest::newRow("Format_RGB32") << QImage::Format_RGB32;
+    QTest::newRow("Format_ARGB32") << QImage::Format_ARGB32;
+    QTest::newRow("Format_ARGB32_Premultiplied") << QImage::Format_ARGB32_Premultiplied;
+    QTest::newRow("Format_RGB16") << QImage::Format_RGB16;
+}
+
+void tst_QPixmap::fromUninitializedImage()
+{
+    QFETCH(QImage::Format, format);
+
+    QImage image(100, 100, format);
+    QPixmap pix = QPixmap::fromImage(image);
+
+    // it simply shouldn't crash...
+    QVERIFY(true);
+
+}
+
 void tst_QPixmap::convertFromImage_data()
 {
     QTest::addColumn<QImage>("img1");