summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-10-28 09:32:13 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2015-10-28 09:32:13 +0100
commit67cbcf399aa1a18b9b1dbac0a6572a865687230a (patch)
tree54de8fb81b35f8922c1cfb10d9b308dcec055eaa /src
parentbdc2df1a04f65c35651ad962f12723e177f4bd2f (diff)
parentcba6b5c3a1e30757c71b905f368d38c2b123f85e (diff)
downloadqtimageformats-67cbcf399aa1a18b9b1dbac0a6572a865687230a.tar.gz
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ie19ac1c5d61d14938ea9457cb9d5944931e046d2
Diffstat (limited to 'src')
-rw-r--r--src/plugins/imageformats/dds/qddshandler.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/imageformats/dds/qddshandler.cpp b/src/plugins/imageformats/dds/qddshandler.cpp
index f7829aa..bfd18cd 100644
--- a/src/plugins/imageformats/dds/qddshandler.cpp
+++ b/src/plugins/imageformats/dds/qddshandler.cpp
@@ -1569,6 +1569,8 @@ bool QDDSHandler::ensureScanned() const
return false;
that->m_format = getFormat(m_header);
+ if (that->m_format == FormatUnknown)
+ return false;
m_scanState = ScanSuccess;
return true;