[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
yurys at chromium.org
yurys at chromium.org
Wed Dec 22 18:43:04 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5ffdff791abbfcb3b76dd4faa9b88df0cb618d1f
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 16 11:20:07 2010 +0000
2010-12-16 Yury Semikhatsky <yurys at chromium.org>
Unreviewed. Fix Chromium Debug compilation after r74177
* platform/graphics/filters/FEComposite.cpp:
(WebCore::arithmetic):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74179 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0827bf5..06f9be8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-16 Yury Semikhatsky <yurys at chromium.org>
+
+ Unreviewed. Fix Chromium Debug compilation after r74177
+
+ * platform/graphics/filters/FEComposite.cpp:
+ (WebCore::arithmetic):
+
2010-12-16 Kent Tamura <tkent at chromium.org>
Unreviewed, build fix.
diff --git a/WebCore/platform/graphics/filters/FEComposite.cpp b/WebCore/platform/graphics/filters/FEComposite.cpp
index 3f32552..f2d98f4 100644
--- a/WebCore/platform/graphics/filters/FEComposite.cpp
+++ b/WebCore/platform/graphics/filters/FEComposite.cpp
@@ -136,7 +136,7 @@ inline void arithmetic(ByteArray* srcPixelArrayA, ByteArray* srcPixelArrayB,
float k1, float k2, float k3, float k4)
{
int pixelArrayLength = srcPixelArrayA->length();
- ASSERT(pixelArrayLength == srcPixelArrayB->length());
+ ASSERT(pixelArrayLength == static_cast<int>(srcPixelArrayB->length()));
unsigned char* source = srcPixelArrayA->data();
unsigned char* destination = srcPixelArrayB->data();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list