diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2011-02-22 04:12:05 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2011-02-22 04:12:05 (GMT) |
| commit | bf9ca539dc4c5efff801856ad9d3f7e14dabad26 (patch) | |
| tree | a5ae494b6e8a2b33f4345f484ba2ead04aca761e /tests/auto/qimagereader | |
| parent | b254be20c03d4dbfc1803cd40dc95d52115b955c (diff) | |
| parent | a34e2ab6f50cc91a4fca5cd7fd7bd22e6495b0c1 (diff) | |
| download | Qt-bf9ca539dc4c5efff801856ad9d3f7e14dabad26.zip Qt-bf9ca539dc4c5efff801856ad9d3f7e14dabad26.tar.gz Qt-bf9ca539dc4c5efff801856ad9d3f7e14dabad26.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7
Conflicts:
tools/qml/qml.pri
Diffstat (limited to 'tests/auto/qimagereader')
| -rw-r--r-- | tests/auto/qimagereader/images/corrupt-pixel-count.xpm | 11 | ||||
| -rw-r--r-- | tests/auto/qimagereader/tst_qimagereader.cpp | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/tests/auto/qimagereader/images/corrupt-pixel-count.xpm b/tests/auto/qimagereader/images/corrupt-pixel-count.xpm new file mode 100644 index 0000000..3a736ff --- /dev/null +++ b/tests/auto/qimagereader/images/corrupt-pixel-count.xpm @@ -0,0 +1,11 @@ +/* XPM */ +static const char *marble_xpm[] = { +/* width height num_colors chars_per_pixel */ +"2 2 2 -2", +/* colors */ +"a c #adadad", +"b c #dedede", +/* pixels */ +"ab", +"ba" +}; diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp index 69e8ead..5321864 100644 --- a/tests/auto/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/qimagereader/tst_qimagereader.cpp @@ -1399,6 +1399,9 @@ void tst_QImageReader::readFromResources_data() QTest::newRow("corrupt-pixels.xpm") << QString("corrupt-pixels.xpm") << QByteArray("xpm") << QSize(0, 0) << QString("QImage: XPM pixels missing on image line 3"); + QTest::newRow("corrupt-pixel-count.xpm") << QString("corrupt-pixel-count.xpm") + << QByteArray("xpm") << QSize(0, 0) + << QString(""); QTest::newRow("marble.xpm") << QString("marble.xpm") << QByteArray("xpm") << QSize(240, 240) << QString(""); |