Commit fa50918e authored by Alexander Alekhin's avatar Alexander Alekhin

Merge moved code from opencv/3.4

parents 61cbb445 7a0ddd82
...@@ -333,7 +333,7 @@ namespace ...@@ -333,7 +333,7 @@ namespace
GpuMat& nextPts = _nextPts.getGpuMatRef(); GpuMat& nextPts = _nextPts.getGpuMatRef();
GpuMat& status = _status.getGpuMatRef(); GpuMat& status = _status.getGpuMatRef();
GpuMat* err = _err.needed() ? &(_err.getGpuMatRef()) : NULL; 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; std::vector<GpuMat> prevPyr, nextPyr;
_prevImg.getGpuMatVector(prevPyr); _prevImg.getGpuMatVector(prevPyr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment