Merge pull request #374 from ivan-korolev:fix_estimateRigidTransform

e0426148 · Andrey Kamaev · OpenCV Buildbot · e72c7736 · b362affd · e0426148
Commit e0426148 authored Jan 30, 2013 by Andrey Kamaev Committed by OpenCV Buildbot Jan 30, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

lkpyramid.cpp modules/video/src/lkpyramid.cpp +5 -2

No files found.
--- a/modules/video/src/lkpyramid.cpp
+++ b/modules/video/src/lkpyramid.cpp
@@ -1911,8 +1911,11 @@ cv::Mat cv::estimateRigidTransform( InputArray src1,
 {
    Mat M(2, 3, CV_64F), A = src1.getMat(), B = src2.getMat();
    CvMat matA = A, matB = B, matM = M;
-    cvEstimateRigidTransform(&matA, &matB, &matM, fullAffine);
+    int err = cvEstimateRigidTransform(&matA, &matB, &matM, fullAffine);
-    return M;
+    if (err == 1)
+        return M;
+    else
+        return Mat();
 }
 /* End of file. */