Merge pull request from melody-rain:2.4_tvl1_ocl

This commit is contained in:
Andrey Pavlenko 2013-10-31 14:03:36 +04:00 committed by OpenCV Buildbot
commit fbabc323ed

@ -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]);
}
}