[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 0daeece937b4c9d3c3b4dd261394396700fb7d4a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 11 14:38:31 2009 +0000

    2009-12-11  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] ImageDecoderQt: Fix retrieval of image file extensions
    
            QImageReader only allows retrieving the format() before actually reading the image.
    
            https://bugs.webkit.org/show_bug.cgi?id=32428
    
            * platform/graphics/qt/ImageDecoderQt.cpp:
            (WebCore::ImageDecoderQt::setData):
            (WebCore::ImageDecoderQt::internalDecodeSize):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51983 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 73a0bda..162cbcd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-11  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] ImageDecoderQt: Fix retrieval of image file extensions
+
+        QImageReader only allows retrieving the format() before actually reading the image.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32428
+
+        * platform/graphics/qt/ImageDecoderQt.cpp:
+        (WebCore::ImageDecoderQt::setData):
+        (WebCore::ImageDecoderQt::internalDecodeSize):
+
 2009-12-11  Simon Hausmann  <hausmann at webkit.org>, Kim Grönholm  <kim.gronholm at nomovok.com>
 
         Reviewed by Antti Koivisto.
diff --git a/WebCore/platform/graphics/qt/ImageDecoderQt.cpp b/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
index b6823dd..9746265 100644
--- a/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
@@ -81,6 +81,9 @@ void ImageDecoderQt::setData(SharedBuffer* data, bool allDataReceived)
     m_buffer->setData(imageData);
     m_buffer->open(QBuffer::ReadOnly);
     m_reader = new QImageReader(m_buffer, m_format);
+
+    // QImageReader only allows retrieving the format before reading the image
+    m_format = m_reader->format();
 }
 
 bool ImageDecoderQt::isSizeAvailable()
@@ -158,7 +161,6 @@ void ImageDecoderQt::internalDecodeSize()
     if (size.isEmpty())
         return failRead();
 
-    m_format = m_reader->format();
     setSize(size.width(), size.height());
 }
 

-- 
WebKit Debian packaging