[Libreoffice-commits] core.git: sc/source

[I-Jui Sung (Ray)]

 sc/source/core/opencl/formulagroupcl.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 46dbc13169a9b97d3f8ac310ac35d5f51eea7de6
Author: I-Jui (Ray) Sung <ray at multicorewareinc.com>
Date:   Fri Nov 15 14:16:40 2013 -0600

    GPU Calc: revert back to OpenCL fmin and fmax
    
    When generating code for MIN and MAX an integer version (min/max) isn't
    correct.
    
    Change-Id: I4bf1e774e37e0ce30924178f022156e0e43f4c06

diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 6c27cd1..3548480 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -775,7 +775,7 @@ public:
     virtual std::string GetBottom(void) { return "MAXFLOAT"; }
     virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const
     {
-        return "min("+lhs + "," + rhs +")";
+        return "fmin("+lhs + "," + rhs +")";
     }
     virtual std::string BinFuncName(void) const { return "min"; }
 };
@@ -785,7 +785,7 @@ public:
     virtual std::string GetBottom(void) { return "-MAXFLOAT"; }
     virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const
     {
-        return "max("+lhs + "," + rhs +")";
+        return "fmax("+lhs + "," + rhs +")";
     }
     virtual std::string BinFuncName(void) const { return "max"; }
 };