Changeset 561 for trunk/src/gui/image/qimagereader.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/image/qimagereader.cpp (modified) (24 diffs)

trunk/src/gui/image/qimagereader.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -48 +48 @@
 
     \reentrant
-    \ingroup multimedia
+    \ingroup painting
     \ingroup io
 
@@ -196 +196 @@
 
 static QImageIOHandler *createReadHandlerHelper(QIODevice *device,
-                                                const QByteArray &format, bool autoDetectImageFormat)
+                                                const QByteArray &format,
+                                                bool autoDetectImageFormat,
+                                                bool ignoresFormatAndExtension)
 {
     if (!autoDetectImageFormat && format.isEmpty())
@@ -218 +220 @@
 #if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
     int suffixPluginIndex = -1;
-    if (device && format.isEmpty() && autoDetectImageFormat) {
+    if (device && format.isEmpty() && autoDetectImageFormat && !ignoresFormatAndExtension) {
         // if there's no format, see if \a device is a file, and if so, find
         // the file suffix and find support for that format among our plugins.
@@ -241 +243 @@
 
     QByteArray testFormat = !form.isEmpty() ? form : suffix;
+
+    if (ignoresFormatAndExtension)
+        testFormat = QByteArray();
 
 #if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
@@ -259 +264 @@
     }
 
-    if (!handler && !testFormat.isEmpty() && autoDetectImageFormat) {
+    if (!handler && !testFormat.isEmpty() && autoDetectImageFormat && !ignoresFormatAndExtension) {
         // check if any plugin supports the format (they are not allowed to
         // read from the device yet).
@@ -316 +321 @@
 
 #if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
-    if (!handler && autoDetectImageFormat) {
+    if (!handler && (autoDetectImageFormat || ignoresFormatAndExtension)) {
         // check if any of our plugins recognize the file from its contents.
         const qint64 pos = device ? device->pos() : 0;
@@ -336 +341 @@
 #endif
 
-    if (!handler && autoDetectImageFormat) {
+    if (!handler && (autoDetectImageFormat || ignoresFormatAndExtension)) {
         // check if any of our built-in handlers recognize the file from its
         // contents.
@@ -435 +440 @@
     QByteArray format;
     bool autoDetectImageFormat;
+    bool ignoresFormatAndExtension;
     QIODevice *device;
     bool deleteDevice;
@@ -459 +465 @@
 */
 QImageReaderPrivate::QImageReaderPrivate(QImageReader *qq)
-    : autoDetectImageFormat(true)
+    : autoDetectImageFormat(true), ignoresFormatAndExtension(false)
 {
     device = 0;
@@ -466 +472 @@
     quality = -1;
     imageReaderError = QImageReader::UnknownError;
-    errorString = QLatin1String(QT_TRANSLATE_NOOP(QImageReader, "Unknown error"));
 
     q = qq;
@@ -523 +528 @@
 
     // assign a handler
-    if (!handler && (handler = createReadHandlerHelper(device, format, autoDetectImageFormat)) == 0) {
+    if (!handler && (handler = createReadHandlerHelper(device, format, autoDetectImageFormat, ignoresFormatAndExtension)) == 0) {
         imageReaderError = QImageReader::UnsupportedFormatError;
         errorString = QLatin1String(QT_TRANSLATE_NOOP(QImageReader, "Unsupported image format"));
@@ -665 +670 @@
     when trying to read the image.
 
-    \endlist    
+    \endlist
 
     By disabling image format autodetection, QImageReader will only query the
@@ -682 +687 @@
     reader; otherwise returns false. By default, autodetection is enabled.
 
-    \sa setAutoDetectImageFormat()    
+    \sa setAutoDetectImageFormat()
 */
 bool QImageReader::autoDetectImageFormat() const
@@ -688 +693 @@
     return d->autoDetectImageFormat;
 }
+
+
+/*!
+    If \a ignored is set to true, then the image reader will ignore
+    specified formats or file extensions and decide which plugin to
+    use only based on the contents in the datastream.
+
+    Setting this flag means that all image plugins gets loaded. Each
+    plugin will read the first bytes in the image data and decide if
+    the plugin is compatible or not.
+
+    This also disables auto detecting the image format.
+
+    \sa decideFormatFromContent()
+*/
+
+void QImageReader::setDecideFormatFromContent(bool ignored)
+{
+    d->ignoresFormatAndExtension = ignored;
+}
+
+
+/*!
+    Returns whether the image reader should decide which plugin to use
+    only based on the contents of the datastream rather than on the file
+    extension.
+
+    \sa setDecideFormatFromContent()
+*/
+
+bool QImageReader::decideFormatFromContent() const
+{
+    return d->ignoresFormatAndExtension;
+}
+
 
 /*!
@@ -1174 +1214 @@
 
 /*!
-    For image formats that support animation, this function returns
-    the number of times the animation should loop. Otherwise, it
-    returns -1.
-
-    \sa supportsAnimation(), QImageIOHandler::loopCount()
+    For image formats that support animation, this function returns the number
+    of times the animation should loop. If this function returns -1, it can
+    either mean the animation should loop forever, or that an error occurred.
+    If an error occurred, canRead() will return false.
+
+    \sa supportsAnimation(), QImageIOHandler::loopCount(), canRead()
 */
 int QImageReader::loopCount() const
@@ -1188 +1229 @@
 
 /*!
-    For image formats that support animation, this function returns
-    the total number of images in the animation.
-
-    Certain animation formats do not support this feature, in which
-    case 0 is returned.
-
-    \sa supportsAnimation(), QImageIOHandler::imageCount()
+    For image formats that support animation, this function returns the total
+    number of images in the animation. If the format does not support
+    animation, 0 is returned.
+
+    This function returns -1 if an error occurred.
+
+    \sa supportsAnimation(), QImageIOHandler::imageCount(), canRead()
 */
 int QImageReader::imageCount() const
@@ -1204 +1245 @@
 
 /*!
-    For image formats that support animation, this function returns
-    the number of milliseconds to wait until displaying the next frame
-    in the animation. Otherwise, 0 is returned.
-
-    \sa supportsAnimation(), QImageIOHandler::nextImageDelay()
+    For image formats that support animation, this function returns the number
+    of milliseconds to wait until displaying the next frame in the animation.
+    If the image format doesn't support animation, 0 is returned.
+
+    This function returns -1 if an error occurred.
+
+    \sa supportsAnimation(), QImageIOHandler::nextImageDelay(), canRead()
 */
 int QImageReader::nextImageDelay() const
@@ -1218 +1261 @@
 
 /*!
-    For image formats that support animation, this function returns
-    the sequence number of the current frame. Otherwise, -1 is
-    returned.
-
-    \sa supportsAnimation(), QImageIOHandler::currentImageNumber()
+    For image formats that support animation, this function returns the
+    sequence number of the current frame. If the image format doesn't support
+    animation, 0 is returned.
+
+    This function returns -1 if an error occurred.
+
+    \sa supportsAnimation(), QImageIOHandler::currentImageNumber(), canRead()
 */
 int QImageReader::currentImageNumber() const
@@ -1262 +1307 @@
 QString QImageReader::errorString() const
 {
+    if (d->errorString.isEmpty())
+        return QLatin1String(QT_TRANSLATE_NOOP(QImageReader, "Unknown error"));
     return d->errorString;
 }
@@ -1310 +1357 @@
 {
     QByteArray format;
-    QImageIOHandler *handler = createReadHandlerHelper(device, format, /* autoDetectImageFormat = */ true);
+    QImageIOHandler *handler = createReadHandlerHelper(device, format, /* autoDetectImageFormat = */ true, false);
     if (handler) {
         if (handler->canRead())
@@ -1338 +1385 @@
     \row    \o XBM    \o X11 Bitmap
     \row    \o XPM    \o X11 Pixmap
+    \row    \o SVG    \o Scalable Vector Graphics
     \endtable