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

[haochen]

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

New commits:
commit 3183bfa7da9771ef355538751d81009e9c1c5c8c
Author: haochen <haoc...@multicorewareinc.com>
Date:   Wed Jun 11 12:59:37 2014 +0800

    GPU Calc:Add more judge for NAN in SingleVector parameter
    
    Change-Id: I01f2576e9d8f6a2e677d1fb08097bc81f15bfbe0

diff --git a/sc/source/core/opencl/opbase.cxx b/sc/source/core/opencl/opbase.cxx
index ccd653c..02b9c37 100644
--- a/sc/source/core/opencl/opbase.cxx
+++ b/sc/source/core/opencl/opbase.cxx
@@ -64,10 +64,10 @@ std::string VectorRef::GenSlidingWindowDeclRef(bool nested) 
const
     std::stringstream ss;
     formula::SingleVectorRefToken *pSVR =
         
dynamic_cast<formula::SingleVectorRefToken*>(DynamicKernelArgument::GetFormulaToken());
-    if (pSVR&&nested)
+    if (pSVR&&!nested)
         ss << "(gid0 < " << pSVR->GetArrayLength() << "?";
     ss << mSymName << "[gid0]";
-    if (pSVR&&nested)
+    if (pSVR&&!nested)
         ss << ":NAN)";
     return ss.str();
 }
@@ -155,7 +155,7 @@ void CheckVariables::CheckSubArgumentIsNan( 
std::stringstream & ss,
          ss<< "    if(";
      }
     ss<< "isNan(";
-    ss<< vSubArguments[i]->GenSlidingWindowDeclRef(false);
+    ss<< vSubArguments[i]->GenSlidingWindowDeclRef(true);
     ss<<"))\n";
     ss<< "        tmp";
     ss<< i;
@@ -164,7 +164,7 @@ void CheckVariables::CheckSubArgumentIsNan( 
std::stringstream & ss,
     ss <<"        tmp";
     ss <<i;
     ss << "=";
-    ss << vSubArguments[i]->GenSlidingWindowDeclRef(false);
+    ss << vSubArguments[i]->GenSlidingWindowDeclRef(true);
     ss<<";\n";
 }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits