Merge pull request #2566 from krodyush:pullreq/140319-PyrLKOpticalFlow

ac92d4c7 · Andrey Pavlenko · OpenCV Buildbot · a6ef45aa · 616ec74b · ac92d4c7
Commit ac92d4c7 authored Apr 08, 2014 by Andrey Pavlenko Committed by OpenCV Buildbot Apr 08, 2014
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lkpyramid.cpp modules/video/src/lkpyramid.cpp +1 -1

pyrlk.cl modules/video/src/opencl/pyrlk.cl +0 -0

No files found.
--- a/modules/video/src/lkpyramid.cpp
+++ b/modules/video/src/lkpyramid.cpp
@@ -987,7 +987,7 @@ namespace cv
            idxArg = kernel.set(idxArg, (int)winSize.height); // int c_winSize_y
            idxArg = kernel.set(idxArg, (int)iters); // int c_iters
            idxArg = kernel.set(idxArg, (char)calcErr); //char calcErr
-            return kernel.run(2, globalThreads, localThreads, true);
+            return kernel.run(2, globalThreads, localThreads, false);
        }
    private:
        inline static bool isDeviceCPU()

--- a/modules/video/src/opencl/pyrlk.cl
+++ b/modules/video/src/opencl/pyrlk.cl