fixed bug in opencv_stitching (added handling of homography evaluation failure)

diff --git a/modules/stitching/main.cpp b/modules/stitching/main.cpp
index ea4b331..d465229 100644 (file)
--- a/modules/stitching/main.cpp
+++ b/modules/stitching/main.cpp
@@ -549,6 +549,7 @@ int main(int argc, char* argv[])
                     sz.width = cvRound(full_img_sizes[i].width * compose_scale);\r
                     sz.height = cvRound(full_img_sizes[i].height * compose_scale);\r
                 }\r
+\r
                 Rect roi = warper->warpRoi(sz, static_cast<float>(cameras[i].focal), cameras[i].R);\r
                 corners[i] = roi.tl();\r
                 sizes[i] = roi.size();\r

diff --git a/modules/stitching/matchers.cpp b/modules/stitching/matchers.cpp
index b043886..6365c2b 100644 (file)
--- a/modules/stitching/matchers.cpp
+++ b/modules/stitching/matchers.cpp
@@ -465,6 +465,8 @@ void BestOf2NearestMatcher::match(const ImageFeatures &features1, const ImageFea
 \r
     // Find pair-wise motion\r
     matches_info.H = findHomography(src_points, dst_points, matches_info.inliers_mask, CV_RANSAC);\r
+    if (abs(determinant(matches_info.H)) < numeric_limits<double>::epsilon())\r
+        return;\r
 \r
     // Find number of inliers\r
     matches_info.num_inliers = 0;\r