opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-16 22:35:51 +08:00
Code Issues Releases Wiki Activity

Merge pull request #2804 from MrKepzie:optflow-rlof-crash

Browse Source
This commit is contained in:
Alexander Alekhin
2021-01-11 20:59:26 +00:00
parent 33ae078b09 55f5303cf3
commit 697d9e2c6c
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/optflow/include/opencv2/optflow/rlofflow.hpp
View File

@@ -227,6 +227,7 @@ public:
* @note If the grid size is set to (1,1) and the forward backward threshold <= 0 than pixelwise dense optical flow field is * @note If the grid size is set to (1,1) and the forward backward threshold <= 0 than pixelwise dense optical flow field is
* computed by RLOF without using interpolation. * computed by RLOF without using interpolation.
* *
* @note Note that in output, if no correspondences are found between \a I0 and \a I1, the \a flow is set to 0.
* @see optflow::calcOpticalFlowDenseRLOF(), optflow::RLOFOpticalFlowParameter * @see optflow::calcOpticalFlowDenseRLOF(), optflow::RLOFOpticalFlowParameter
*/ */
class CV_EXPORTS_W DenseRLOFOpticalFlow : public DenseOpticalFlow class CV_EXPORTS_W DenseRLOFOpticalFlow : public DenseOpticalFlow
@@ -493,6 +494,7 @@ public:
* computed with the RLOF. * computed with the RLOF.
* *
* @note SIMD parallelization is only available when compiling with SSE4.1. * @note SIMD parallelization is only available when compiling with SSE4.1.
* @note Note that in output, if no correspondences are found between \a I0 and \a I1, the \a flow is set to 0.
* *
* @sa optflow::DenseRLOFOpticalFlow, optflow::RLOFOpticalFlowParameter * @sa optflow::DenseRLOFOpticalFlow, optflow::RLOFOpticalFlowParameter
*/ */

6
modules/optflow/src/rlofflow.cpp
View File

@@ -203,7 +203,11 @@ public:
filtered_prevPoints = prevPoints; filtered_prevPoints = prevPoints;
filtered_currPoints = currPoints; filtered_currPoints = currPoints;
} }
// Interpolators below expect non empty matches
if (filtered_prevPoints.empty()) {
flow.setTo(0);
return;
}
if (interp_type == InterpolationType::INTERP_EPIC) if (interp_type == InterpolationType::INTERP_EPIC)
{ {
Ptr<ximgproc::EdgeAwareInterpolator> gd = ximgproc::createEdgeAwareInterpolator(); Ptr<ximgproc::EdgeAwareInterpolator> gd = ximgproc::createEdgeAwareInterpolator();