Changeset 63652 in webkit

Timestamp:

Jul 19, 2010 5:45:50 AM (14 years ago)

Author:

andreas.kling@nokia.com

Message:

2010-07-19 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Avoid QImage::pixel() in getImageData()
​https://bugs.webkit.org/show_bug.cgi?id=42463

• platform/graphics/qt/ImageBufferQt.cpp: (WebCore::getImageData): Use QImage::scanLine() instead of fetching data pixel-by-pixel.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/ImageBufferQt.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-19  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Avoid QImage::pixel() in getImageData()
+        https://bugs.webkit.org/show_bug.cgi?id=42463
+
+        * platform/graphics/qt/ImageBufferQt.cpp:
+        (WebCore::getImageData): Use QImage::scanLine() instead
+        of fetching data pixel-by-pixel.
+
 2010-07-19  Yury Semikhatsky  <yurys@chromium.org>
 

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

@@ -187 +187 @@
     unsigned char* destRows = data + desty * destBytesPerRow + destx * 4;
     for (int y = 0; y < numRows; ++y) {
+#if QT_VERSION >= 0x040700
+        const quint32* scanLine = reinterpret_cast<const quint32*>(image.constScanLine(y + originy));
+#else
+        quint32* scanLine = reinterpret_cast<quint32*>(image.scanLine(y + originy));
+#endif
         for (int x = 0; x < numColumns; x++) {
-            QRgb value = image.pixel(x + originx, y + originy);
+            QRgb value = scanLine[x + originx];
             int basex = x * 4;