Changeset 65227 in webkit

Timestamp:

Aug 12, 2010 2:43:50 AM (14 years ago)

Author:

Simon Hausmann

Message:

[Qt] Decode images directly to QPixmap
​https://bugs.webkit.org/show_bug.cgi?id=40797

Patch by Benjamin Poulain <​benjamin.poulain@nokia.com> on 2010-08-12
Reviewed by Simon Hausmann.

Use the new API of Qt 4.7 to decode data from the image
reader directly to QPixmap.

This allow us to use JDCT_IFAST when decoding jpeg images
to pixmap, and to decode animated GIF images, while still
using in-place conversion of color space.

• platform/graphics/qt/ImageDecoderQt.cpp:

(WebCore::ImageDecoderQt::setData):
(WebCore::ImageDecoderQt::internalHandleCurrentImage):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/ImageDecoderQt.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-12  Benjamin Poulain  <benjamin.poulain@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Decode images directly to QPixmap
+        https://bugs.webkit.org/show_bug.cgi?id=40797
+
+        Use the new API of Qt 4.7 to decode data from the image
+        reader directly to QPixmap.
+
+        This allow us to use JDCT_IFAST when decoding jpeg images
+        to pixmap, and to decode animated GIF images, while still
+        using in-place conversion of color space.
+
+        * platform/graphics/qt/ImageDecoderQt.cpp:
+        (WebCore::ImageDecoderQt::setData):
+        (WebCore::ImageDecoderQt::internalHandleCurrentImage):
+
 2010-07-14  Marcus Bulach  <bulach@chromium.org>
 

trunk/WebCore/platform/graphics/qt/ImageDecoderQt.cpp

@@ -79 +79 @@
     m_reader.set(new QImageReader(m_buffer.get(), m_format));
 
+    // This will force the JPEG decoder to use JDCT_IFAST
+    m_reader->setQuality(49);
+
     // QImageReader only allows retrieving the format before reading the image
     m_format = m_reader->format();
@@ -187 +190 @@
 {
     QPixmap pixmap;
-    bool pixmapLoaded;
-    const int imageCount = m_reader->imageCount();
-    if (imageCount == 0 || imageCount == 1)
-        pixmapLoaded = pixmap.loadFromData((const uchar*)(m_data->data()), m_data->size(), m_format);
-    else {
-        QImage img;
-        const bool imageLoaded = m_reader->read(&img);
-        if (imageLoaded) {
-            pixmap = QPixmap::fromImage(img);
-            pixmapLoaded = true;
-        }
-    }
-
-    if (!pixmapLoaded) {
+
+#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
+    pixmap = QPixmap::fromImageReader(m_reader.get());
+#else
+    QImage img;
+    if (m_reader->read(&img))
+        pixmap = QPixmap::fromImage(img);
+#endif
+
+    if (pixmap.isNull()) {
         frameCount();
         repetitionCount();