Merge pull request #1655 from pengx17:2.4_opt_superres_ocl

2013-10-25 19:47:38 +04:00
parent fc64a4071c 7285341083
commit 66e5be2d64
4 changed files with 84 additions and 165 deletions
--- a/modules/ocl/src/optical_flow_farneback.cpp
+++ b/modules/ocl/src/optical_flow_farneback.cpp
@@ -336,8 +336,6 @@ void cv::ocl::FarnebackOpticalFlow::updateFlow_boxFilter(

    swap(M, bufM);

-    finish();
-
    optflow_farneback::updateFlowOcl(M, flowx, flowy);

    if (updateMatrices)