Changeset 846 for trunk/src/gui/image/qxpmhandler.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/image/qxpmhandler.cpp (modified) (3 diffs)

trunk/src/gui/image/qxpmhandler.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -767 +767 @@
     XPMRGBData x;
     x.name = name_no_space;
-    // Funtion bsearch() is supposed to be
+    // Funtion bsearch() is supposed to be
     // void *bsearch(const void *key, const void *base, ...
     // So why (char*)? Are there broken bsearch() declarations out there?
@@ -1226 +1226 @@
 bool QXpmHandler::canRead() const
 {
-    if (state == Ready && canRead(device())) {
+    if (state == Ready && !canRead(device()))
+        return false;
+
+    if (state != Error) {
         setFormat("xpm");
         return true;
     }
-    return state != Error;
+
+    return false;
 }