diff options
| author | aavit <qt_aavit@ovi.com> | 2012-01-24 16:05:02 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-25 02:22:18 +0100 |
| commit | 48f9ba388b374d56764d9bd9455fda527f6bafba (patch) | |
| tree | 3da4940606741fc994128bf35d08c81957215135 /src/gui/image/qimagereader.cpp | |
| parent | c0d30db45ca0af9c3010097d8cd8b1ae92cf83ea (diff) | |
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 <lars.knoll@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/gui/image/qimagereader.cpp')
| -rw-r--r-- | src/gui/image/qimagereader.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp index b089483445..3c770ef140 100644 --- a/src/gui/image/qimagereader.cpp +++ b/src/gui/image/qimagereader.cpp @@ -144,9 +144,6 @@ #ifndef QT_NO_IMAGEFORMAT_JPEG #include <private/qjpeghandler_p.h> #endif -#ifndef QT_NO_IMAGEFORMAT_MNG -#include <private/qmnghandler_p.h> -#endif #ifndef QT_NO_IMAGEFORMAT_TIFF #include <private/qtiffhandler_p.h> #endif @@ -168,9 +165,6 @@ enum _qt_BuiltInFormatType { #ifndef QT_NO_IMAGEFORMAT_JPEG _qt_JpgFormat, #endif -#ifndef QT_NO_IMAGEFORMAT_MNG - _qt_MngFormat, -#endif #ifndef QT_NO_IMAGEFORMAT_TIFF _qt_TifFormat, #endif @@ -206,9 +200,6 @@ static const _qt_BuiltInFormatStruct _qt_BuiltInFormats[] = { #ifndef QT_NO_IMAGEFORMAT_JPEG {_qt_JpgFormat, "jpg"}, #endif -#ifndef QT_NO_IMAGEFORMAT_MNG - {_qt_MngFormat, "mng"}, -#endif #ifndef QT_NO_IMAGEFORMAT_TIFF {_qt_TifFormat, "tif"}, #endif @@ -344,10 +335,6 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device, } else if (testFormat == "jpg" || testFormat == "jpeg") { handler = new QJpegHandler; #endif -#ifndef QT_NO_IMAGEFORMAT_MNG - } else if (testFormat == "mng") { - handler = new QMngHandler; -#endif #ifndef QT_NO_IMAGEFORMAT_TIFF } else if (testFormat == "tif" || testFormat == "tiff") { handler = new QTiffHandler; @@ -440,12 +427,6 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device, handler = new QJpegHandler; break; #endif -#ifndef QT_NO_IMAGEFORMAT_MNG - case _qt_MngFormat: - if (QMngHandler::canRead(device)) - handler = new QMngHandler; - break; -#endif #ifndef QT_NO_IMAGEFORMAT_TIFF case _qt_TifFormat: if (QTiffHandler::canRead(device)) @@ -1466,7 +1447,6 @@ QByteArray QImageReader::imageFormat(QIODevice *device) \row \o GIF \o Graphic Interchange Format (optional) \row \o JPG \o Joint Photographic Experts Group \row \o JPEG \o Joint Photographic Experts Group - \row \o MNG \o Multiple-image Network Graphics \row \o PNG \o Portable Network Graphics \row \o PBM \o Portable Bitmap \row \o PGM \o Portable Graymap |