Merge pull request #2373 from mlyashko:optflow_dualtvl1

2014-03-11 16:00:21 +04:00
parent 5261fbe217 eb2e8a11fa
commit 702a2a6ff6
6 changed files with 1140 additions and 151 deletions
--- a/modules/core/src/ocl.cpp
+++ b/modules/core/src/ocl.cpp
@@ -2814,7 +2814,8 @@ int Kernel::set(int i, const void* value, size_t sz)
 {
    if (!p || !p->handle)
        return -1;
-    CV_Assert(i >= 0);
+    if (i < 0)
+        return i;
    if( i == 0 )
        p->cleanupUMats();

@@ -2840,7 +2841,8 @@ int Kernel::set(int i, const KernelArg& arg)
 {
    if( !p || !p->handle )
        return -1;
-    CV_Assert( i >= 0 );
+    if (i < 0)
+        return i;
    if( i == 0 )
        p->cleanupUMats();
    if( arg.m )