From 48f9ba388b374d56764d9bd9455fda527f6bafba Mon Sep 17 00:00:00 2001 From: aavit Date: Tue, 24 Jan 2012 16:05:02 +0100 Subject: Remove support for the MNG file format and the bundled libmng The MNG file format is generally abandoned, and libmng has been unmaintained for several years. The MNG plugin and bundled libmng has been moved to the qtimageformats project on Gerrit. Task-number: QTBUG-21869 Change-Id: I946432347014ffde2b72307a5f8b166ca5553602 Reviewed-by: Lars Knoll Reviewed-by: Friedemann Kleint --- tests/auto/gui/image/qimagereader/images/ball.mng | Bin 34394 -> 0 bytes .../auto/gui/image/qimagereader/images/corrupt.mng | Bin 183 -> 0 bytes tests/auto/gui/image/qimagereader/images/fire.mng | Bin 44430 -> 0 bytes tests/auto/gui/image/qimagereader/qimagereader.qrc | 3 -- .../gui/image/qimagereader/tst_qimagereader.cpp | 43 +-------------------- tests/auto/gui/image/qmovie/animations/dutch.mng | Bin 18534 -> 0 bytes tests/auto/gui/image/qmovie/qmovie.pro | 1 - tests/auto/gui/image/qmovie/tst_qmovie.cpp | 4 -- .../image/qimageconversion/qimageconversion.pro | 1 - .../gui/image/qimagereader/images/ball.mng | Bin 34394 -> 0 bytes .../gui/image/qimagereader/images/corrupt.mng | Bin 183 -> 0 bytes .../gui/image/qimagereader/images/fire.mng | Bin 44430 -> 0 bytes .../gui/image/qimagereader/qimagereader.pro | 1 - .../gui/image/qimagereader/tst_qimagereader.cpp | 4 -- 14 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 tests/auto/gui/image/qimagereader/images/ball.mng delete mode 100644 tests/auto/gui/image/qimagereader/images/corrupt.mng delete mode 100644 tests/auto/gui/image/qimagereader/images/fire.mng delete mode 100644 tests/auto/gui/image/qmovie/animations/dutch.mng delete mode 100644 tests/benchmarks/gui/image/qimagereader/images/ball.mng delete mode 100644 tests/benchmarks/gui/image/qimagereader/images/corrupt.mng delete mode 100644 tests/benchmarks/gui/image/qimagereader/images/fire.mng (limited to 'tests') diff --git a/tests/auto/gui/image/qimagereader/images/ball.mng b/tests/auto/gui/image/qimagereader/images/ball.mng deleted file mode 100644 index 81544780fd..0000000000 Binary files a/tests/auto/gui/image/qimagereader/images/ball.mng and /dev/null differ diff --git a/tests/auto/gui/image/qimagereader/images/corrupt.mng b/tests/auto/gui/image/qimagereader/images/corrupt.mng deleted file mode 100644 index 17fd43a5ca..0000000000 Binary files a/tests/auto/gui/image/qimagereader/images/corrupt.mng and /dev/null differ diff --git a/tests/auto/gui/image/qimagereader/images/fire.mng b/tests/auto/gui/image/qimagereader/images/fire.mng deleted file mode 100644 index c6695c8369..0000000000 Binary files a/tests/auto/gui/image/qimagereader/images/fire.mng and /dev/null differ diff --git a/tests/auto/gui/image/qimagereader/qimagereader.qrc b/tests/auto/gui/image/qimagereader/qimagereader.qrc index 2c70652389..1f8c3ad412 100644 --- a/tests/auto/gui/image/qimagereader/qimagereader.qrc +++ b/tests/auto/gui/image/qimagereader/qimagereader.qrc @@ -6,7 +6,6 @@ images/YCbCr_cmyk.png images/YCbCr_rgb.jpg images/away.png - images/ball.mng images/bat1.gif images/bat2.gif images/beavis.jpg @@ -18,12 +17,10 @@ images/corrupt.bmp images/corrupt.gif images/corrupt.jpg - images/corrupt.mng images/corrupt.png images/corrupt.xbm images/crash-signed-char.bmp images/earth.gif - images/fire.mng images/font.bmp images/gnus.xbm images/image.pbm diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp index 6253cc45c4..8d4c43be0a 100644 --- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp @@ -256,9 +256,6 @@ void tst_QImageReader::readImage_data() QTest::newRow("GIF: earth") << QString("earth.gif") << true << QByteArray("gif"); QTest::newRow("GIF: trolltech") << QString("trolltech.gif") << true << QByteArray("gif"); - QTest::newRow("MNG: ball") << QString("ball.mng") << true << QByteArray("mng"); - QTest::newRow("MNG: fire") << QString("fire.mng") << true << QByteArray("mng"); - QTest::newRow("SVG: rect") << QString("rect.svg") << true << QByteArray("svg"); QTest::newRow("SVGZ: rect") << QString("rect.svgz") << true << QByteArray("svgz"); } @@ -374,9 +371,6 @@ void tst_QImageReader::setScaledSize_data() QTest::newRow("GIF: earth") << "earth" << QSize(200, 200) << QByteArray("gif"); QTest::newRow("GIF: trolltech") << "trolltech" << QSize(200, 200) << QByteArray("gif"); - QTest::newRow("MNG: ball") << "ball" << QSize(200, 200) << QByteArray("mng"); - QTest::newRow("MNG: fire") << "fire" << QSize(200, 200) << QByteArray("mng"); - QTest::newRow("SVG: rect") << "rect" << QSize(200, 200) << QByteArray("svg"); QTest::newRow("SVGZ: rect") << "rect" << QSize(200, 200) << QByteArray("svgz"); } @@ -441,9 +435,6 @@ void tst_QImageReader::setClipRect_data() QTest::newRow("GIF: earth") << "earth" << QRect(0, 0, 50, 50) << QByteArray("gif"); QTest::newRow("GIF: trolltech") << "trolltech" << QRect(0, 0, 50, 50) << QByteArray("gif"); - QTest::newRow("MNG: ball") << "ball" << QRect(0, 0, 50, 50) << QByteArray("mng"); - QTest::newRow("MNG: fire") << "fire" << QRect(0, 0, 50, 50) << QByteArray("mng"); - QTest::newRow("SVG: rect") << "rect" << QRect(0, 0, 50, 50) << QByteArray("svg"); QTest::newRow("SVGZ: rect") << "rect" << QRect(0, 0, 50, 50) << QByteArray("svgz"); } @@ -489,9 +480,6 @@ void tst_QImageReader::setScaledClipRect_data() QTest::newRow("GIF: earth") << "earth" << QRect(0, 0, 50, 50) << QByteArray("gif"); QTest::newRow("GIF: trolltech") << "trolltech" << QRect(0, 0, 50, 50) << QByteArray("gif"); - QTest::newRow("MNG: ball") << "ball" << QRect(0, 0, 50, 50) << QByteArray("mng"); - QTest::newRow("MNG: fire") << "fire" << QRect(0, 0, 50, 50) << QByteArray("mng"); - QTest::newRow("SVG: rect") << "rect" << QRect(0, 0, 50, 50) << QByteArray("svg"); QTest::newRow("SVGZ: rect") << "rect" << QRect(0, 0, 50, 50) << QByteArray("svgz"); } @@ -545,8 +533,6 @@ void tst_QImageReader::imageFormat_data() QTest::newRow("bmp-4") << QString("test32v5.bmp") << QByteArray("bmp") << QImage::Format_RGB32; QTest::newRow("png") << QString("kollada.png") << QByteArray("png") << QImage::Format_ARGB32; QTest::newRow("png-2") << QString("YCbCr_cmyk.png") << QByteArray("png") << QImage::Format_RGB32; - QTest::newRow("mng-1") << QString("ball.mng") << QByteArray("mng") << QImage::Format_Invalid; - QTest::newRow("mng-2") << QString("fire.mng") << QByteArray("mng") << QImage::Format_Invalid; QTest::newRow("svg") << QString("rect.svg") << QByteArray("svg") << QImage::Format_ARGB32_Premultiplied; QTest::newRow("svgz") << QString("rect.svgz") << QByteArray("svgz") << QImage::Format_ARGB32_Premultiplied; } @@ -625,9 +611,6 @@ void tst_QImageReader::setBackgroundColor_data() QTest::newRow("GIF: earth") << QString("earth.gif") << QColor(Qt::cyan); QTest::newRow("GIF: trolltech") << QString("trolltech.gif") << QColor(Qt::magenta); - QTest::newRow("MNG: ball") << QString("ball.mng") << QColor(Qt::yellow); - QTest::newRow("MNG: fire") << QString("fire.mng") << QColor(Qt::gray); - QTest::newRow("SVG: rect") << QString("rect.svg") << QColor(Qt::darkGreen); QTest::newRow("SVGZ: rect") << QString("rect.svgz") << QColor(Qt::darkGreen); } @@ -664,9 +647,6 @@ void tst_QImageReader::supportsAnimation_data() QTest::newRow("GIF: earth") << QString("earth.gif") << true; QTest::newRow("GIF: trolltech") << QString("trolltech.gif") << true; - QTest::newRow("MNG: ball") << QString("ball.mng") << true; - QTest::newRow("MNG: fire") << QString("fire.mng") << true; - QTest::newRow("SVG: rect") << QString("rect.svg") << false; QTest::newRow("SVGZ: rect") << QString("rect.svgz") << false; } @@ -693,10 +673,6 @@ void tst_QImageReader::sizeBeforeRead() QImageReader reader(prefix + fileName); QVERIFY(reader.canRead()); - if (format == "mng") { - QCOMPARE(reader.size(), QSize()); - return; - } QSize size = reader.size(); QVERIFY(reader.canRead()); @@ -1043,9 +1019,6 @@ void tst_QImageReader::readFromDevice_data() QTest::newRow("bmp-4") << QString("test32v5.bmp") << QByteArray("bmp"); QTest::newRow("png") << QString("kollada.png") << QByteArray("png"); - QTest::newRow("mng-1") << QString("ball.mng") << QByteArray("mng"); - QTest::newRow("mng-2") << QString("fire.mng") << QByteArray("mng"); - QTest::newRow("svg") << QString("rect.svg") << QByteArray("svg"); QTest::newRow("svgz") << QString("rect.svgz") << QByteArray("svgz"); #if defined QTEST_HAVE_TGA @@ -1165,7 +1138,7 @@ void tst_QImageReader::readFromFileAfterJunk() if (format == "ppm" || format == "pbm" || format == "pgm" || format == "svg" || format == "svgz") iterations = 1; - if (format == "mng" || !QImageWriter::supportedImageFormats().contains(format)) { + if (!QImageWriter::supportedImageFormats().contains(format)) { for (int i = 0; i < iterations; ++i) { junkFile.write("deadbeef", 9); QCOMPARE(junkFile.write(imageData), qint64(imageData.size())); @@ -1321,15 +1294,6 @@ void tst_QImageReader::readFromResources_data() QTest::newRow("qtbug13653-no_eoi.jpg") << QString("qtbug13653-no_eoi.jpg") << QByteArray("jpg") << QSize(240, 180) << QString(""); - QTest::newRow("corrupt.mng") << QString("corrupt.mng") - << QByteArray("mng") << QSize(0, 0) - << QString("MNG error 901: Application signalled I/O error; chunk IHDR; subcode 0:0"); - QTest::newRow("fire.mng") << QString("fire.mng") - << QByteArray("mng") << QSize(30, 60) - << QString(""); - QTest::newRow("ball.mng") << QString("ball.mng") - << QByteArray("mng") << QSize(32, 32) - << QString(""); QTest::newRow("rect.svg") << QString("rect.svg") << QByteArray("svg") << QSize(105, 137) << QString(""); @@ -1497,9 +1461,6 @@ void tst_QImageReader::readCorruptImage_data() << QString("JPEG datastream contains no image") << QByteArray("jpeg"); QTest::newRow("corrupt gif") << QString("corrupt.gif") << true << QString("") << QByteArray("gif"); - QTest::newRow("corrupt mng") << QString("corrupt.mng") << true - << QString("MNG error 901: Application signalled I/O error; chunk IHDR; subcode 0:0") - << QByteArray("mng"); QTest::newRow("corrupt png") << QString("corrupt.png") << true << QString("") << QByteArray("png"); QTest::newRow("corrupt bmp") << QString("corrupt.bmp") << true << QString("") << QByteArray("bmp"); QTest::newRow("corrupt xpm (colors)") << QString("corrupt-colors.xpm") << true @@ -1860,8 +1821,6 @@ void tst_QImageReader::testIgnoresFormatAndExtension_data() QTest::newRow("beavis.jpg") << "beavis" << "jpg" << "jpeg"; - QTest::newRow("fire.mng") << "fire" << "mng" << "mng"; - QTest::newRow("image_100dpi.tif") << "image_100dpi" << "tif" << "tiff"; QTest::newRow("rect.svg") << "rect" << "svg" << "svg"; diff --git a/tests/auto/gui/image/qmovie/animations/dutch.mng b/tests/auto/gui/image/qmovie/animations/dutch.mng deleted file mode 100644 index 4917fdee7a..0000000000 Binary files a/tests/auto/gui/image/qmovie/animations/dutch.mng and /dev/null differ diff --git a/tests/auto/gui/image/qmovie/qmovie.pro b/tests/auto/gui/image/qmovie/qmovie.pro index 5da0b80670..b2891a482f 100644 --- a/tests/auto/gui/image/qmovie/qmovie.pro +++ b/tests/auto/gui/image/qmovie/qmovie.pro @@ -6,7 +6,6 @@ MOC_DIR=tmp !contains(QT_CONFIG, no-gif):DEFINES += QTEST_HAVE_GIF !contains(QT_CONFIG, no-jpeg):DEFINES += QTEST_HAVE_JPEG -!contains(QT_CONFIG, no-mng):DEFINES += QTEST_HAVE_MNG RESOURCES += resources.qrc TESTDATA += animations/* diff --git a/tests/auto/gui/image/qmovie/tst_qmovie.cpp b/tests/auto/gui/image/qmovie/tst_qmovie.cpp index 61b079bf13..21bd504276 100644 --- a/tests/auto/gui/image/qmovie/tst_qmovie.cpp +++ b/tests/auto/gui/image/qmovie/tst_qmovie.cpp @@ -137,10 +137,6 @@ void tst_QMovie::playMovie_data() { QTest::addColumn("fileName"); QTest::addColumn("frameCount"); -#if defined(QTEST_HAVE_MNG) && !defined(Q_OS_WINCE) - // Qt/WinCE runs out of memory for this one... - QTest::newRow("home") << QString("animations/dutch.mng") << 10; -#endif #ifdef QTEST_HAVE_GIF QTest::newRow("comicsecard") << QString("animations/comicsecard.gif") << 5; QTest::newRow("trolltech") << QString("animations/trolltech.gif") << 34; diff --git a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro index 7b3ba93737..e04026bb7f 100644 --- a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro +++ b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro @@ -5,5 +5,4 @@ SOURCES += tst_qimageconversion.cpp !contains(QT_CONFIG, no-gif):DEFINES += QTEST_HAVE_GIF !contains(QT_CONFIG, no-jpeg):DEFINES += QTEST_HAVE_JPEG -!contains(QT_CONFIG, no-mng):DEFINES += QTEST_HAVE_MNG !contains(QT_CONFIG, no-tiff):DEFINES += QTEST_HAVE_TIFF diff --git a/tests/benchmarks/gui/image/qimagereader/images/ball.mng b/tests/benchmarks/gui/image/qimagereader/images/ball.mng deleted file mode 100644 index 81544780fd..0000000000 Binary files a/tests/benchmarks/gui/image/qimagereader/images/ball.mng and /dev/null differ diff --git a/tests/benchmarks/gui/image/qimagereader/images/corrupt.mng b/tests/benchmarks/gui/image/qimagereader/images/corrupt.mng deleted file mode 100644 index 17fd43a5ca..0000000000 Binary files a/tests/benchmarks/gui/image/qimagereader/images/corrupt.mng and /dev/null differ diff --git a/tests/benchmarks/gui/image/qimagereader/images/fire.mng b/tests/benchmarks/gui/image/qimagereader/images/fire.mng deleted file mode 100644 index c6695c8369..0000000000 Binary files a/tests/benchmarks/gui/image/qimagereader/images/fire.mng and /dev/null differ diff --git a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro index 311ffad009..8e5faca575 100644 --- a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro +++ b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro @@ -7,7 +7,6 @@ SOURCES += tst_qimagereader.cpp !contains(QT_CONFIG, no-gif):DEFINES += QTEST_HAVE_GIF !contains(QT_CONFIG, no-jpeg):DEFINES += QTEST_HAVE_JPEG -!contains(QT_CONFIG, no-mng):DEFINES += QTEST_HAVE_MNG !contains(QT_CONFIG, no-tiff):DEFINES += QTEST_HAVE_TIFF QT += network diff --git a/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp b/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp index a14f3b6bf6..7a05712f46 100644 --- a/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp +++ b/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp @@ -117,10 +117,6 @@ tst_QImageReader::tst_QImageReader() images << QPair(QLatin1String("earth.gif"), QByteArray("gif")); images << QPair(QLatin1String("trolltech.gif"), QByteArray("gif")); #endif -#if defined QTEST_HAVE_MNG - images << QPair(QLatin1String("ball.mng"), QByteArray("mng")); - images << QPair(QLatin1String("fire.mng"), QByteArray("mng")); -#endif } tst_QImageReader::~tst_QImageReader() -- cgit v1.2.3