Merge moved code from opencv/3.4

83e98d24 · Alexander Alekhin · 5cfdefbf · 92729b3c · 83e98d24
Commit 83e98d24 authored Oct 09, 2019 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

NCVBroxOpticalFlow.cu modules/cudalegacy/src/cuda/NCVBroxOpticalFlow.cu +2 -2

No files found.
--- a/modules/cudalegacy/src/cuda/NCVBroxOpticalFlow.cu
+++ b/modules/cudalegacy/src/cuda/NCVBroxOpticalFlow.cu
@@ -955,7 +955,7 @@ NCVStatus NCVBroxOpticalFlow(const NCVBroxOpticalFlowDescriptor desc,

            //compute derivatives
            dim3 dBlocks(iDivUp(kLevelWidth, 32), iDivUp(kLevelHeight, 6));
-            dim3 dThreads(32, 6);
+            //dim3 dThreads(32, 6);

            const int kPitchTex = kLevelStride * sizeof(float);

@@ -1121,7 +1121,7 @@ NCVStatus NCVBroxOpticalFlow(const NCVBroxOpticalFlowDescriptor desc,
                Ncv32u ns = alignUp(nw, kStrideAlignmentFloat);

                dim3 p_blocks(iDivUp(nw, 32), iDivUp(nh, 8));
-                dim3 p_threads(32, 8);
+                //dim3 p_threads(32, 8);

                NcvSize32u inner_srcSize (kLevelWidth, kLevelHeight);
                NcvSize32u dstSize (nw, nh);