Fixed QImageReader::format() inconsistency.

If state is set to ReadHeader before canRead() then setFormat("png")
never gets called. We should make sure that setFormat() gets set
whenever canRead() returns true.

Task-number: QTBUG-2263
Reviewed-by: Kent Hansen

1 files changed, 6 insertions, 4 deletions

diff --git a/src/gui/image/qppmhandler.cpp b/src/gui/image/qppmhandler.cpp
index cbbbef4b20..a9e796c268 100644
--- a/src/gui/image/qppmhandler.cpp
+++ b/src/gui/image/qppmhandler.cpp
@@ -409,13 +409,15 @@ bool QPpmHandler::readHeader()
 
 bool QPpmHandler::canRead() const
 {
-    if (state == Ready) {
-        if (!canRead(device(), &subType))
-            return false;
+    if (state == Ready && !canRead(device(), &subType))
+        return false;
+
+    if (state != Error) {
         setFormat(subType);
         return true;
     }
-    return state != Error;
+
+    return false;
 }
 
 bool QPpmHandler::canRead(QIODevice *device, QByteArray *subType)