Changeset 70050 in webkit


Ignore:
Timestamp:
Oct 19, 2010 5:46:03 AM (13 years ago)
Author:
andreas.kling@nokia.com
Message:

2010-10-19 Andreas Kling <kling@webkit.org>

Reviewed by Tor Arne Vestbø.

[Qt] getImageData returns wrong data for non-0,0 source offset
https://bugs.webkit.org/show_bug.cgi?id=47898

Test: fast/canvas/canvas-getImageData-negative-source.html

  • platform/graphics/qt/ImageBufferQt.cpp: (WebCore::getImageData): Add missing *4's to get correct pixel offset.

2010-10-19 Andreas Kling <kling@webkit.org>

Reviewed by Tor Arne Vestbø.

[Qt] getImageData returns wrong data for non-0,0 source offset
https://bugs.webkit.org/show_bug.cgi?id=47898

  • fast/canvas/canvas-getImageData-negative-source-expected.txt: Added.
  • fast/canvas/canvas-getImageData-negative-source.html: Added.
  • fast/canvas/script-tests/canvas-getImageData-negative-source.js: Added.
Location:
trunk
Files:
3 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r70047 r70050  
     12010-10-19  Andreas Kling  <kling@webkit.org>
     2
     3        Reviewed by Tor Arne Vestbø.
     4
     5        [Qt] getImageData returns wrong data for non-0,0 source offset
     6        https://bugs.webkit.org/show_bug.cgi?id=47898
     7
     8        * fast/canvas/canvas-getImageData-negative-source-expected.txt: Added.
     9        * fast/canvas/canvas-getImageData-negative-source.html: Added.
     10        * fast/canvas/script-tests/canvas-getImageData-negative-source.js: Added.
     11
    1122010-10-19  Ben Murdoch  <benm@google.com>
    213
  • trunk/WebCore/ChangeLog

    r70049 r70050  
     12010-10-19  Andreas Kling  <kling@webkit.org>
     2
     3        Reviewed by Tor Arne Vestbø.
     4
     5        [Qt] getImageData returns wrong data for non-0,0 source offset
     6        https://bugs.webkit.org/show_bug.cgi?id=47898
     7
     8        Test: fast/canvas/canvas-getImageData-negative-source.html
     9
     10        * platform/graphics/qt/ImageBufferQt.cpp:
     11        (WebCore::getImageData): Add missing *4's to get correct pixel offset.
     12
    1132010-10-19  Andreas Kling  <kling@webkit.org>
    214
  • trunk/WebCore/platform/graphics/qt/ImageBufferQt.cpp

    r70049 r70050  
    218218#endif
    219219
    220     quint32* destRows = reinterpret_cast_ptr<quint32*>(&data[desty * rect.width() + destx]);
     220    quint32* destRows = reinterpret_cast_ptr<quint32*>(&data[desty * rect.width() * 4 + destx * 4]);
    221221
    222222    if (multiplied == Unmultiplied) {
Note: See TracChangeset for help on using the changeset viewer.