diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-17 16:43:48 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-17 16:43:48 (GMT) |
| commit | cb5e66d1d43c0cf452aff0e437a2ea9011c6b659 (patch) | |
| tree | 0aa5378385a5492e4fe55c7b7003cd32f83bf6b6 /tests/auto/qimagewriter | |
| parent | 798ff84b2bd26da5ba2d01bf44e4a4d40dfcacac (diff) | |
| parent | 334b2a93d461ae9a8b258fff1971fb775b13bb68 (diff) | |
| download | Qt-cb5e66d1d43c0cf452aff0e437a2ea9011c6b659.zip Qt-cb5e66d1d43c0cf452aff0e437a2ea9011c6b659.tar.gz Qt-cb5e66d1d43c0cf452aff0e437a2ea9011c6b659.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/auto/qimagewriter')
| -rw-r--r-- | tests/auto/qimagewriter/tst_qimagewriter.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/tests/auto/qimagewriter/tst_qimagewriter.cpp b/tests/auto/qimagewriter/tst_qimagewriter.cpp index ab5572d..5997f39 100644 --- a/tests/auto/qimagewriter/tst_qimagewriter.cpp +++ b/tests/auto/qimagewriter/tst_qimagewriter.cpp @@ -391,16 +391,27 @@ void tst_QImageWriter::readWriteNonDestructive_data() { QTest::addColumn<QImage::Format>("format"); QTest::addColumn<QImage::Format>("expectedFormat"); - QTest::newRow("tiff mono") << QImage::Format_Mono << QImage::Format_Mono; - QTest::newRow("tiff indexed") << QImage::Format_Indexed8 << QImage::Format_Indexed8; - QTest::newRow("tiff rgb32") << QImage::Format_ARGB32 << QImage::Format_ARGB32; + QTest::addColumn<bool>("grayscale"); + QTest::newRow("tiff mono") << QImage::Format_Mono << QImage::Format_Mono << false; + QTest::newRow("tiff indexed") << QImage::Format_Indexed8 << QImage::Format_Indexed8 << false; + QTest::newRow("tiff rgb32") << QImage::Format_ARGB32 << QImage::Format_ARGB32 << false; + QTest::newRow("tiff grayscale") << QImage::Format_Indexed8 << QImage::Format_Indexed8 << true; } void tst_QImageWriter::readWriteNonDestructive() { QFETCH(QImage::Format, format); QFETCH(QImage::Format, expectedFormat); + QFETCH(bool, grayscale); QImage image = QImage(prefix + "colorful.bmp").convertToFormat(format); + + if (grayscale) { + QVector<QRgb> colors; + for (int i = 0; i < 256; ++i) + colors << qRgb(i, i, i); + image.setColorTable(colors); + } + QVERIFY(image.save(prefix + "gen-readWriteNonDestructive.tiff")); QImage image2 = QImage(prefix + "gen-readWriteNonDestructive.tiff"); |