generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid assert in lapac.cpp if findHomography fails in BestOf2NearestMatcher::match

Browse Source
This commit is contained in:
Andrey Kamaev 2013-03-12 22:36:00 +04:00
parent 9f3ce0dd97
commit 55698548dd
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/src/lapack.cpp
View File

@ -878,6 +878,7 @@ double cv::determinant( InputArray _mat )
size_t step = mat.step;
const uchar* m = mat.data;
CV_Assert( !mat.empty() );
CV_Assert( mat.rows == mat.cols && (type == CV_32F || type == CV_64F));
#define Mf(y, x) ((float*)(m + y*step))[x]

2
modules/stitching/src/matchers.cpp
View File

@ -573,7 +573,7 @@ void BestOf2NearestMatcher::match(const ImageFeatures &features1, const ImageFea
// Find pair-wise motion
matches_info.H = findHomography(src_points, dst_points, matches_info.inliers_mask, CV_RANSAC);
if (std::abs(determinant(matches_info.H)) < std::numeric_limits<double>::epsilon())
if (matches_info.H.empty() || std::abs(determinant(matches_info.H)) < std::numeric_limits<double>::epsilon())
return;
// Find number of inliers