diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-09 19:51:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-09 19:51:55 (GMT) |
| commit | 965516d4ed2f600b28ee730d4dfbdc083ecdbac4 (patch) | |
| tree | c2e8c4972bdf3596730a79319844050cdf32fd7b /tests | |
| parent | 1dfe43a858b4b5a60004160086e7486d8f80e064 (diff) | |
| parent | 4809920df3c3329d47f595c1287ab44b454abb88 (diff) | |
| download | Qt-965516d4ed2f600b28ee730d4dfbdc083ecdbac4.zip Qt-965516d4ed2f600b28ee730d4dfbdc083ecdbac4.tar.gz Qt-965516d4ed2f600b28ee730d4dfbdc083ecdbac4.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha_animated.gif | bin | 0 -> 4075 bytes | |||
| -rw-r--r-- | tests/auto/qpixmap/tst_qpixmap.cpp | 13 |
2 files changed, 12 insertions, 1 deletions
diff --git a/tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha_animated.gif b/tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha_animated.gif Binary files differnew file mode 100644 index 0000000..86a3a2e --- /dev/null +++ b/tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha_animated.gif diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp index 8005ec5..24cbb21 100644 --- a/tests/auto/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/qpixmap/tst_qpixmap.cpp @@ -179,6 +179,7 @@ private slots: void fromImageReader_data(); void fromImageReader(); + void fromImageReaderAnimatedGif_data(); void fromImageReaderAnimatedGif(); void preserveDepth(); @@ -1605,6 +1606,8 @@ void tst_QPixmap::fromImageReader_data() QTest::newRow("designer_indexed8_no_alpha.gif") << prefix + "/designer_indexed8_no_alpha.gif"; QTest::newRow("designer_indexed8_with_alpha.gif") << prefix + "/designer_indexed8_with_alpha.gif"; QTest::newRow("designer_rgb32.jpg") << prefix + "/designer_rgb32.jpg"; + QTest::newRow("designer_indexed8_with_alpha_animated") << prefix + "/designer_indexed8_with_alpha_animated.gif"; + QTest::newRow("designer_indexed8_with_alpha_animated") << prefix + "/designer_indexed8_no_alpha_animated.gif"; } void tst_QPixmap::fromImageReader() @@ -1621,14 +1624,22 @@ void tst_QPixmap::fromImageReader() QVERIFY(pixmapsAreEqual(&pixmapWithCopy, &directLoadingPixmap)); } +void tst_QPixmap::fromImageReaderAnimatedGif_data() +{ + QTest::addColumn<QString>("imagePath"); + QTest::newRow("gif with alpha") << QString::fromLatin1("/designer_indexed8_with_alpha_animated.gif"); + QTest::newRow("gif without alpha") << QString::fromLatin1("/designer_indexed8_no_alpha_animated.gif"); +} + void tst_QPixmap::fromImageReaderAnimatedGif() { + QFETCH(QString, imagePath); #ifdef Q_OS_SYMBIAN const QString prefix = QLatin1String(SRCDIR) + "loadFromData"; #else const QString prefix = QLatin1String(SRCDIR) + "/loadFromData"; #endif - const QString path = prefix + QString::fromLatin1("/designer_indexed8_with_alpha_animated.gif"); + const QString path = prefix + imagePath; QImageReader referenceReader(path); QImageReader pixmapReader(path); |
