diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-24 19:36:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-24 19:47:55 +0100 |
| commit | 018828170d807f6647a843e61c82733c3f601d14 (patch) | |
| tree | d666670c8a60f7ffb7e2446ca2818bbd07bacc97 /src/plugins/imageformats/dds/qddshandler.cpp | |
| parent | 11300c62aa021ef07f3e4de8bd875bfcbcbe2f7e (diff) | |
| parent | 16362da5762b2375ac986d19266cef0bcdc5047c (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Conflicts:
src/plugins/imageformats/webp/qwebphandler.cpp
Change-Id: I494e140819746c83e586bea72d8b02a7d245d970
Diffstat (limited to 'src/plugins/imageformats/dds/qddshandler.cpp')
| -rw-r--r-- | src/plugins/imageformats/dds/qddshandler.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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) { |