Changeset 53674 in webkit

Timestamp:

Jan 21, 2010 9:23:12 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-21 Joe Mason <​jmason@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):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/filters/FEComponentTransfer.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-21  Joe Mason  <jmason@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@google.com>
 

trunk/WebCore/platform/graphics/filters/FEComponentTransfer.cpp

@@ -4 +4 @@
                   2005 Eric Seidel <eric@webkit.org>
                   2009 Dirk Schulze <krit@webkit.org>
+    Copyright (C) Research In Motion Limited 2010. All rights reserved.
 
     This library is free software; you can redistribute it and/or
@@ -141 +142 @@
 {
     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);