[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sc/source

[Libreoffice Gerrit user]

 sc/source/core/opencl/op_statistical.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 64d54e91a054e31b0a8378036577ff890ad7eb28
Author:     Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Tue Nov 27 16:21:43 2018 +0100
Commit:     Luboš Luňák <l.lu...@collabora.com>
CommitDate: Wed Dec 5 10:58:52 2018 +0100

    fixes for OpenCL COVAR()
    
    Change-Id: Ie171eea334de65b993554146c11adb95e0dbb85e
    Reviewed-on: https://gerrit.libreoffice.org/64245
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
    (cherry picked from commit 9a446225f4d395b584887eb42851e40cf2ab1fc7)
    Reviewed-on: https://gerrit.libreoffice.org/64535

diff --git a/sc/source/core/opencl/op_statistical.cxx 
b/sc/source/core/opencl/op_statistical.cxx
index d18b3ffceec1..fd4508727d87 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -6843,6 +6843,7 @@ void OpPoisson::GenSlidingWindowFunction(
 void OpCovar::GenSlidingWindowFunction(std::stringstream& ss,
     const std::string &sSymName, SubArguments& vSubArguments)
 {
+        CHECK_PARAMETER_COUNT(2,2);
         ss << "\ndouble " << sSymName;
         ss << "_"<< BinFuncName() <<"(";
         for (size_t i = 0; i < vSubArguments.size(); i++)
@@ -6944,7 +6945,7 @@ void OpCovar::GenSlidingWindowFunction(std::stringstream& 
ss,
             else {
                 ss << "int i = 0; i < " << nCurWindowSizeX << " && ";
                 ss << " i + gid0 < " << pCurDVRX->GetArrayLength();
-                ss << " && i + gid0 < " << pCurDVRX->GetArrayLength();
+                ss << " && i + gid0 < " << pCurDVRY->GetArrayLength();
                 ss << "; i++) {\n";
                 ss << "if ((isnan(";
                 ss << vSubArguments[0]->GenSlidingWindowDeclRef() << ")) || ";
@@ -7054,6 +7055,10 @@ void 
OpCovar::GenSlidingWindowFunction(std::stringstream& ss,
             ss << "    }\n";
             ss << "}";
         }
+        else
+        {
+            throw Unhandled(__FILE__, __LINE__);
+        }
         }
         else {
         ss << "    int cnt0 = 0,cnt1 = 0;\n";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits