Changeset 846 for trunk/src/plugins/imageformats/svg/main.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/plugins/imageformats/svg/main.cpp (modified) (2 diffs)

trunk/src/plugins/imageformats/svg/main.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])
@@ -63 +63 @@
 QStringList QSvgPlugin::keys() const
 {
-    return QStringList() << QLatin1String("svg");
+    return QStringList() << QLatin1String("svg");
 }
 
 QImageIOPlugin::Capabilities QSvgPlugin::capabilities(QIODevice *device, const QByteArray &format) const
 {
-    //### canRead disabled for now because it's hard to detect
-    //    whether the file is actually svg without parsing it
-    //if (device->isReadable() && QSvgIOHandler::canRead(device))
-
-    if (format == "svg")
+    if (format == "svg" || format == "svgz")
         return Capabilities(CanRead);
-    else
-        return 0;
-
-
-    if (!device->isOpen())
+    if (!format.isEmpty())
         return 0;
 
     Capabilities cap;
-    if (device->isReadable())
+    if (device->isReadable())
         cap |= CanRead;
     return cap;