summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-24 19:36:15 +0100
committerLiang Qi <liang.qi@qt.io>2016-11-24 19:47:55 +0100
commit018828170d807f6647a843e61c82733c3f601d14 (patch)
treed666670c8a60f7ffb7e2446ca2818bbd07bacc97
parent11300c62aa021ef07f3e4de8bd875bfcbcbe2f7e (diff)
parent16362da5762b2375ac986d19266cef0bcdc5047c (diff)
downloadqtimageformats-018828170d807f6647a843e61c82733c3f601d14.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Conflicts: src/plugins/imageformats/webp/qwebphandler.cpp Change-Id: I494e140819746c83e586bea72d8b02a7d245d970
-rw-r--r--src/plugins/imageformats/dds/qddshandler.cpp5
-rw-r--r--src/plugins/imageformats/imageformats.pro2
-rw-r--r--src/plugins/imageformats/tga/qtgafile.cpp2
-rw-r--r--src/plugins/imageformats/webp/qwebphandler.cpp1
-rw-r--r--sync.profile10
5 files changed, 8 insertions, 12 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)
{
diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro
index 08f5151..23ada9a 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/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
);