diff options
author | ABBAPOH <ABBAPOH@nextmail.ru> | 2013-12-13 19:21:27 +0400 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-16 11:47:46 +0100 |
commit | 5aedb778707f2707d66eb848276e8c2f0b4d447c (patch) | |
tree | fc915f35922cb6a18dbed2fbdd45742653600335 /src/plugins/imageformats/dds/qddshandler.h | |
parent | 481275bf95128b71a2b70f99142a3e39a3b3507e (diff) |
Do not try to rescan device in case of an error in DDS plugin.
Change-Id: I64b49294476fc3bbf77620d839b88b0ecea68e23
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Alex Char <prevedtest@gmail.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/plugins/imageformats/dds/qddshandler.h')
-rw-r--r-- | src/plugins/imageformats/dds/qddshandler.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/imageformats/dds/qddshandler.h b/src/plugins/imageformats/dds/qddshandler.h index 542bd35..582a013 100644 --- a/src/plugins/imageformats/dds/qddshandler.h +++ b/src/plugins/imageformats/dds/qddshandler.h @@ -70,15 +70,21 @@ public: static bool canRead(QIODevice *device); private: - bool ensureHeaderCached() const; + bool ensureScanned() const; bool verifyHeader(const DDSHeader &dds) const; private: + enum ScanState { + ScanError = -1, + ScanNotScanned = 0, + ScanSuccess = 1, + }; + DDSHeader m_header; int m_format; DDSHeaderDX10 m_header10; int m_currentImage; - mutable bool m_headerCached; + mutable ScanState m_scanState; }; QT_END_NAMESPACE |