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

[pkasting at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 748798d25cecbc52efe54f5adea2cdf5d0e23987
Author: pkasting at chromium.org <pkasting at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 15 02:04:50 2010 +0000

    Unreviewed, attempted build fix.
    
    * platform/image-decoders/gif/GIFImageDecoder.cpp:
    (WebCore::GIFImageDecoder::haveDecodedRow):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53311 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a1f2a63..e868033 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2010-01-14  Peter Kasting  <pkasting at google.com>
 
+        Unreviewed, attempted build fix.
+
+        * platform/image-decoders/gif/GIFImageDecoder.cpp:
+        (WebCore::GIFImageDecoder::haveDecodedRow):
+
+2010-01-14  Peter Kasting  <pkasting at google.com>
+
         Reviewed by Adam Barth.
 
         Simplify image decoders by making downsampling functions available at
diff --git a/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp b/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
index c3a6f2d..a0e5be9 100644
--- a/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
@@ -355,7 +355,7 @@ bool GIFImageDecoder::haveDecodedRow(unsigned frameIndex,
     // row's X-coordinates.
     int xBegin = upperBoundScaledX(m_reader->frameXOffset());
     int yBegin = upperBoundScaledY(m_reader->frameYOffset() + rowNumber);
-    int xEnd = lowerBoundScaledX(std::min(xBegin + (rowEnd - rowBuffer), size().width()) - 1, xBegin + 1) + 1;
+    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;
     if (!rowBuffer || (xBegin < 0) || (yBegin < 0) || (xEnd <= xBegin) || (yEnd <= yBegin))
         return true;

-- 
WebKit Debian packaging