[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
bfulgham at webkit.org
bfulgham at webkit.org
Thu Feb 4 21:31:40 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit aee20a9af7fe158a71c109fffabb4e4d1d20fb29
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 29 01:28:05 2010 +0000
Unreviewed build fix after r53411 on WinCairo.
* platform/image-decoders/gif/GIFImageDecoder.cpp:
(WebCore::GIFImageDecoder::frameCount):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54032 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 44ea53d..3956aa8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-28 Brent Fulgham <bfulgham at webkit.org>
+
+ Unreviewed build fix after r53411 on WinCairo.
+
+ * platform/image-decoders/gif/GIFImageDecoder.cpp:
+ (WebCore::GIFImageDecoder::frameCount):
+
2010-01-28 Nayan Kumar K <nayankk at gmail.com>
Reviewed by Laszlo Gombos.
diff --git a/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp b/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
index fd33cc0..1124bd2 100644
--- a/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
@@ -81,7 +81,7 @@ size_t GIFImageDecoder::frameCount()
// This function may fail, but we want to keep any partial data it may
// have decoded, so don't mark it is invalid. If there is an overflow
// or some serious error, m_failed will have gotten set for us.
- reader.read((const unsigned char*)m_data->data(), m_data->size(), GIFFrameCountQuery, -1);
+ reader.read((const unsigned char*)m_data->data(), m_data->size(), GIFFrameCountQuery, static_cast<unsigned>(-1));
m_frameCountValid = true;
m_frameBufferCache.resize(reader.images_count);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list