Merge moved code from opencv/3.4

alalek · alalek · commit fa50918ea351 · 2019-11-11T18:21:57.000Z
diff --git a/modules/cudaoptflow/src/pyrlk.cpp b/modules/cudaoptflow/src/pyrlk.cpp
@@ -333,7 +333,7 @@ namespace
             GpuMat& nextPts = _nextPts.getGpuMatRef();
             GpuMat& status = _status.getGpuMatRef();
             GpuMat* err = _err.needed() ? &(_err.getGpuMatRef()) : NULL;
-            if (_prevImg.kind() == _InputArray::STD_VECTOR_CUDA_GPU_MAT && _prevImg.kind() == _InputArray::STD_VECTOR_CUDA_GPU_MAT)
+            if (_prevImg.kind() == _InputArray::STD_VECTOR_CUDA_GPU_MAT && _nextImg.kind() == _InputArray::STD_VECTOR_CUDA_GPU_MAT)
             {
                 std::vector<GpuMat> prevPyr, nextPyr;
                 _prevImg.getGpuMatVector(prevPyr);

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ namespace`
`333`	`333`	`GpuMat& nextPts = _nextPts.getGpuMatRef();`
`334`	`334`	`GpuMat& status = _status.getGpuMatRef();`
`335`	`335`	`GpuMat* err = _err.needed() ? &(_err.getGpuMatRef()) : NULL;`
`336`		`- if (_prevImg.kind() == _InputArray::STD_VECTOR_CUDA_GPU_MAT && _prevImg.kind() == _InputArray::STD_VECTOR_CUDA_GPU_MAT)`
	`336`	`+ if (_prevImg.kind() == _InputArray::STD_VECTOR_CUDA_GPU_MAT && _nextImg.kind() == _InputArray::STD_VECTOR_CUDA_GPU_MAT)`
`337`	`337`	`{`
`338`	`338`	`std::vector<GpuMat> prevPyr, nextPyr;`
`339`	`339`	`_prevImg.getGpuMatVector(prevPyr);`