diff options
| -rw-r--r-- | src/imageformats/doc/src/qtimageformats.qdoc | 10 | ||||
| -rw-r--r-- | src/plugins/imageformats/dds/qddshandler.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/imageformats/imageformats.pro | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/macjp2/qiiofhelpers.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/tga/qtgafile.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/webp/qwebphandler.cpp | 1 | ||||
| -rw-r--r-- | sync.profile | 10 |
7 files changed, 16 insertions, 16 deletions
diff --git a/src/imageformats/doc/src/qtimageformats.qdoc b/src/imageformats/doc/src/qtimageformats.qdoc index c7f9687..90369ed 100644 --- a/src/imageformats/doc/src/qtimageformats.qdoc +++ b/src/imageformats/doc/src/qtimageformats.qdoc @@ -51,17 +51,21 @@ libraries. If not found, it may fall back on using a bundled copy (in \c src/3rdparty). \table -\header \li Format \li Description \li Support \li 3rd party codec +\header \li Format \li Description \li Support \li 3rd Party Codec \row \li DDS \li Direct Draw Surface \li Read/write \li No \row \li ICNS \li Apple Icon Image \li Read/write \li No -\row \li JP2 \li Joint Photographic Experts Group 2000 \li Read/write \li Yes (bundled) -\row \li MNG \li Multiple-image Network Graphics \li Read \li Yes (bundled) +\row \li JP2 \li Joint Photographic Experts Group 2000 \li Read/write \li Yes (bundled, unmaintained) +\row \li MNG \li Multiple-image Network Graphics \li Read \li Yes (bundled, unmaintained) \row \li TGA \li Truevision Graphics Adapter \li Read \li No \row \li TIFF \li Tagged Image File Format \li Read/write \li Yes (bundled) \row \li WBMP \li Wireless Bitmap \li Read/write \li No \row \li WEBP \li WebP \li Read/write \li Yes (bundled) \endtable +\note Some bundled third party codecs are not maintained anymore. They are +provided for manual builds only, and not used as a fallback in case system +libraries are unavailable. + \section2 Deployment When built, the Qt Image Formats plugins are located as dynamic diff --git a/src/plugins/imageformats/dds/qddshandler.cpp b/src/plugins/imageformats/dds/qddshandler.cpp index 1d6a178..3a44b51 100644 --- a/src/plugins/imageformats/dds/qddshandler.cpp +++ b/src/plugins/imageformats/dds/qddshandler.cpp @@ -996,7 +996,8 @@ static QImage readA2W10V10U10(QDataStream &s, quint32 width, quint32 height) quint8 b = qint8((tmp & 0x000003ff) >> 0 >> 2) + 128; quint8 a = 0xff * ((tmp & 0xc0000000) >> 30) / 3; // dunno why we should swap b and r here - line[x] = qRgba(b, g, r, a); + std::swap(b, r); + line[x] = qRgba(r, g, b, a); } } @@ -1373,7 +1374,9 @@ static int formatByName(const QByteArray &name) } QDDSHandler::QDDSHandler() : + m_header(), m_format(FormatA8R8G8B8), + m_header10(), m_currentImage(0), m_scanState(ScanNotScanned) { diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro index 24f5f84..118d7ea 100644 --- a/src/plugins/imageformats/imageformats.pro +++ b/src/plugins/imageformats/imageformats.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs SUBDIRS = \ - dds \ +# dds \ icns \ tga \ tiff \ diff --git a/src/plugins/imageformats/macjp2/qiiofhelpers.cpp b/src/plugins/imageformats/macjp2/qiiofhelpers.cpp index 99903b0..c894932 100644 --- a/src/plugins/imageformats/macjp2/qiiofhelpers.cpp +++ b/src/plugins/imageformats/macjp2/qiiofhelpers.cpp @@ -74,7 +74,7 @@ static off_t cbSkipForward(void *info, off_t count) } else { char *buf = new char[count]; res = dev->read(buf, count); - delete buf; + delete[] buf; } return qMax(qint64(0), res); } diff --git a/src/plugins/imageformats/tga/qtgafile.cpp b/src/plugins/imageformats/tga/qtgafile.cpp index 355b8a1..52e5eab 100644 --- a/src/plugins/imageformats/tga/qtgafile.cpp +++ b/src/plugins/imageformats/tga/qtgafile.cpp @@ -58,7 +58,7 @@ struct Tga16Reader : public TgaReader if (s->getChar(&ch1) && s->getChar(&ch2)) { quint16 d = (int(ch1) & 0xFF) | ((int(ch2) & 0xFF) << 8); QRgb result = (d & 0x8000) ? 0xFF000000 : 0x00000000; - result |= (d & 0x7C00 << 6) | (d & 0x03E0 << 3) | (d & 0x001F); + result |= ((d & 0x7C00) << 6) | ((d & 0x03E0) << 3) | (d & 0x001F); return result; } else { return 0; diff --git a/src/plugins/imageformats/webp/qwebphandler.cpp b/src/plugins/imageformats/webp/qwebphandler.cpp index a59e6bd..0bd89f6 100644 --- a/src/plugins/imageformats/webp/qwebphandler.cpp +++ b/src/plugins/imageformats/webp/qwebphandler.cpp @@ -51,6 +51,7 @@ QWebpHandler::QWebpHandler() : m_lossless(false), m_quality(75), m_scanState(ScanNotScanned), + m_features(), m_loop(0), m_frameCount(0), m_demuxer(NULL), diff --git a/sync.profile b/sync.profile index 3fad8a6..6d035bc 100644 --- a/sync.profile +++ b/sync.profile @@ -1,10 +1,2 @@ -# Module dependencies. -# Every module that is required to build this module should have one entry. -# Each of the module version specifiers can take one of the following values: -# - A specific Git revision. -# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) -# - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch) -# -%dependencies = ( - "qtbase" => "", +%modules = ( # path to module name map ); |