still a couple tabs and trailing whitespaces...

5c8e679b · Ernest Galbrun · ca6fb27e · 5c8e679b · 5c8e679b · 5c8e679b
Commit 5c8e679b authored Jul 07, 2014 by Ernest Galbrun
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

tvl1flow.cu modules/cudaoptflow/src/cuda/tvl1flow.cu +0 -0

test_optflow.cpp modules/cudaoptflow/test/test_optflow.cpp +0 -0

tvl1flow.cpp modules/video/src/tvl1flow.cpp +0 -1

No files found.
--- a/modules/cudaoptflow/src/cuda/tvl1flow.cu
+++ b/modules/cudaoptflow/src/cuda/tvl1flow.cu
--- a/modules/cudaoptflow/test/test_optflow.cpp
+++ b/modules/cudaoptflow/test/test_optflow.cpp
--- a/modules/video/src/tvl1flow.cpp
+++ b/modules/video/src/tvl1flow.cpp
@@ -1060,7 +1060,6 @@ float estimateU(const Mat_<float>& v1, const Mat_<float>& v2, const Mat_<float>&
            u1Row[x] = v1Row[x] + theta * divP1Row[x];
            u2Row[x] = v2Row[x] + theta * divP2Row[x];
            if (use_gamma) u3Row[x] = v3Row[x] + theta * divP3Row[x];
-         
            error += use_gamma?(u1Row[x] - u1k) * (u1Row[x] - u1k) + (u2Row[x] - u2k) * (u2Row[x] - u2k) + (u3Row[x] - u3k) * (u3Row[x] - u3k):
                               (u1Row[x] - u1k) * (u1Row[x] - u1k) + (u2Row[x] - u2k) * (u2Row[x] - u2k);
        }