Merge pull request #1726 from melody-rain:2.4_tvl1_ocl

fbabc323 · Andrey Pavlenko · OpenCV Buildbot · bf58049d · 599cf6be · fbabc323
Commit fbabc323 authored Oct 31, 2013 by Andrey Pavlenko Committed by OpenCV Buildbot Oct 31, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

tvl1flow.cpp modules/ocl/src/tvl1flow.cpp +2 -4

No files found.
--- a/modules/ocl/src/tvl1flow.cpp
+++ b/modules/ocl/src/tvl1flow.cpp
@@ -121,10 +121,8 @@ void cv::ocl::OpticalFlowDual_TVL1_OCL::operator()(const oclMat& I0, const oclMa
            ocl::pyrDown(u1s[s - 1], u1s[s]);
            ocl::pyrDown(u2s[s - 1], u2s[s]);

-            //ocl::multiply(u1s[s], Scalar::all(0.5), u1s[s]);
-            multiply(0.5, u1s[s], u1s[s]);
-            //ocl::multiply(u2s[s], Scalar::all(0.5), u2s[s]);
-            multiply(0.5, u1s[s], u2s[s]);
+            ocl::multiply(0.5, u1s[s], u1s[s]);
+            ocl::multiply(0.5, u2s[s], u2s[s]);
        }
    }