diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-28 09:32:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-28 09:32:13 +0100 |
| commit | 67cbcf399aa1a18b9b1dbac0a6572a865687230a (patch) | |
| tree | 54de8fb81b35f8922c1cfb10d9b308dcec055eaa | |
| parent | bdc2df1a04f65c35651ad962f12723e177f4bd2f (diff) | |
| parent | cba6b5c3a1e30757c71b905f368d38c2b123f85e (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ie19ac1c5d61d14938ea9457cb9d5944931e046d2
| -rw-r--r-- | src/plugins/imageformats/dds/qddshandler.cpp | 2 |
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; |