[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 0d681c54e606835a198c33a7f5cbab7fa2a1140a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 22 05:23:12 2010 +0000

    2010-01-21  Joe Mason  <jmason at rim.com>
    
            Reviewed by Darin Adler.
    
            Promote pow argument to double to resolve ambiguous overload (compile fix for RVCT 4.0)
            https://bugs.webkit.org/show_bug.cgi?id=33952
    
            * platform/graphics/filters/FEComponentTransfer.cpp:
            (WebCore::gamma):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53674 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a1e2b4b..da5ee2a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-21  Joe Mason  <jmason at rim.com>
+
+        Reviewed by Darin Adler.
+
+        Promote pow argument to double to resolve ambiguous overload (compile fix for RVCT 4.0)
+        https://bugs.webkit.org/show_bug.cgi?id=33952
+
+        * platform/graphics/filters/FEComponentTransfer.cpp:
+        (WebCore::gamma):
+
 2010-01-21  Andrei Popescu  <andreip at google.com>
 
         Reviewed by David Levin.
diff --git a/WebCore/platform/graphics/filters/FEComponentTransfer.cpp b/WebCore/platform/graphics/filters/FEComponentTransfer.cpp
index 1d9cfff..f9aa011 100644
--- a/WebCore/platform/graphics/filters/FEComponentTransfer.cpp
+++ b/WebCore/platform/graphics/filters/FEComponentTransfer.cpp
@@ -3,6 +3,7 @@
                   2004, 2005 Rob Buis <buis at kde.org>
                   2005 Eric Seidel <eric at webkit.org>
                   2009 Dirk Schulze <krit at webkit.org>
+    Copyright (C) Research In Motion Limited 2010. All rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -140,7 +141,8 @@ static void linear(unsigned char* values, const ComponentTransferFunction& trans
 static void gamma(unsigned char* values, const ComponentTransferFunction& transferFunction)
 {
     for (unsigned i = 0; i < 256; ++i) {
-        double val = 255.0 * (transferFunction.amplitude * pow((i / 255.0), transferFunction.exponent) + transferFunction.offset);
+        double exponent = transferFunction.exponent; // RCVT doesn't like passing a double and a float to pow, so promote this to double
+        double val = 255.0 * (transferFunction.amplitude * pow((i / 255.0), exponent) + transferFunction.offset);
         val = std::max(0.0, std::min(255.0, val));
         values[i] = static_cast<unsigned char>(val);
     }

-- 
WebKit Debian packaging