[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 13:27:47 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 7e5d8a5f8ee7bc718674a3f6f5aea6ed2bfdc7c5
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 11:16:16 2010 +0000

    2010-09-16  Yong Li  <yoli at rim.com>
    
            Reviewed by George Staikos.
    
            Add a test for GIF down sampling.
    
            GIF image down sampling can miss some lines
            https://bugs.webkit.org/show_bug.cgi?id=45322
    
            * fast/images/gif-large-checkerboard.html: Added.
            * fast/images/resources/large-gif-checkerboard.GIF: Added.
    2010-09-16  Yong Li  <yoli at rim.com>
    
            Reviewed by George Staikos.
    
            Fix the bug that GIF image down sampling can miss some lines.
            https://bugs.webkit.org/show_bug.cgi?id=45322
    
            Test: fast/images/gif-large-checkerboard.html
    
            * platform/image-decoders/gif/GIFImageDecoder.cpp:
            (WebCore::GIFImageDecoder::haveDecodedRow):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67604 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f678f1a..4c89e98 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-16  Yong Li  <yoli at rim.com>
+
+        Reviewed by George Staikos.
+
+        Add a test for GIF down sampling.
+
+        GIF image down sampling can miss some lines
+        https://bugs.webkit.org/show_bug.cgi?id=45322
+
+        * fast/images/gif-large-checkerboard.html: Added.
+        * fast/images/resources/large-gif-checkerboard.GIF: Added.
+
 2010-09-08  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Steve Block.
diff --git a/LayoutTests/fast/images/gif-large-checkerboard.html b/LayoutTests/fast/images/gif-large-checkerboard.html
new file mode 100644
index 0000000..2b78bca
--- /dev/null
+++ b/LayoutTests/fast/images/gif-large-checkerboard.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<img src="resources/large-gif-checkerboard.gif">
+</body>
+</html>
diff --git a/LayoutTests/fast/images/resources/large-gif-checkerboard.GIF b/LayoutTests/fast/images/resources/large-gif-checkerboard.GIF
new file mode 100644
index 0000000..61df805
Binary files /dev/null and b/LayoutTests/fast/images/resources/large-gif-checkerboard.GIF differ
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 416386c..e83df77 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-16  Yong Li  <yoli at rim.com>
+
+        Reviewed by George Staikos.
+
+        Fix the bug that GIF image down sampling can miss some lines.
+        https://bugs.webkit.org/show_bug.cgi?id=45322
+
+        Test: fast/images/gif-large-checkerboard.html
+
+        * platform/image-decoders/gif/GIFImageDecoder.cpp:
+        (WebCore::GIFImageDecoder::haveDecodedRow):
+
 2010-09-16  Philippe Normand  <pnormand at igalia.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp b/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
index a2397ee..4d2a92d 100644
--- a/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
@@ -197,8 +197,8 @@ bool GIFImageDecoder::haveDecodedRow(unsigned frameIndex, unsigned char* rowBuff
     // row's X-coordinates.
     int xBegin = upperBoundScaledX(frameReader->x_offset);
     int yBegin = upperBoundScaledY(frameReader->y_offset + rowNumber);
-    int xEnd = lowerBoundScaledX(std::min(xBegin + static_cast<int>(rowEnd - rowBuffer), size().width()) - 1, xBegin + 1) + 1;
-    int yEnd = lowerBoundScaledY(std::min(yBegin + static_cast<int>(repeatCount), size().height()) - 1, yBegin + 1) + 1;
+    int xEnd = lowerBoundScaledX(std::min(static_cast<int>(frameReader->x_offset + (rowEnd - rowBuffer)), size().width()) - 1, xBegin + 1) + 1;
+    int yEnd = lowerBoundScaledY(std::min(static_cast<int>(frameReader->y_offset + rowNumber + repeatCount), size().height()) - 1, yBegin + 1) + 1;
     if (!rowBuffer || (xBegin < 0) || (yBegin < 0) || (xEnd <= xBegin) || (yEnd <= yBegin))
         return true;
 

-- 
WebKit Debian packaging

