From 62fed8b7b2de9195bb58c057057e21874529647e Mon Sep 17 00:00:00 2001 From: Ernest Galbrun Date: Mon, 7 Jul 2014 12:55:07 +0200 Subject: [PATCH] retry after failure to load from the build bot --- modules/cudaoptflow/src/cuda/tvl1flow.cu | 4 ++-- modules/video/doc/motion_analysis_and_object_tracking.rst | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/cudaoptflow/src/cuda/tvl1flow.cu b/modules/cudaoptflow/src/cuda/tvl1flow.cu index 405cdab48c00..094415048d7d 100644 --- a/modules/cudaoptflow/src/cuda/tvl1flow.cu +++ b/modules/cudaoptflow/src/cuda/tvl1flow.cu @@ -209,8 +209,8 @@ namespace tvl1flow __global__ void estimateUKernel(const PtrStepSzf I1wx, const PtrStepf I1wy, const PtrStepf grad, const PtrStepf rho_c, - const PtrStepf p11, const PtrStepf p12, - const PtrStepf p21, const PtrStepf p22, + const PtrStepf p11, const PtrStepf p12, + const PtrStepf p21, const PtrStepf p22, const PtrStepf p31, const PtrStepf p32, PtrStepf u1, PtrStepf u2, PtrStepf u3, PtrStepf error, const float l_t, const float theta, const float gamma, const bool calcError) diff --git a/modules/video/doc/motion_analysis_and_object_tracking.rst b/modules/video/doc/motion_analysis_and_object_tracking.rst index d21037105e2a..332495de0337 100644 --- a/modules/video/doc/motion_analysis_and_object_tracking.rst +++ b/modules/video/doc/motion_analysis_and_object_tracking.rst @@ -1083,9 +1083,8 @@ createOptFlow_DualTVL1 Parameter used for motion estimation. It adds a variable allowing for illumination variations Set this parameter to 1 if you have varying illumination. - See: [Chambolle2011]_ - - + See: [Chambolle2011]_ + DenseOpticalFlow::calc -------------------------- Calculates an optical flow.