Rebase and merge pull request #342 from ilysenkov/bugfix_2470

2013-01-29 15:53:42 +04:00
parent 98fdd70466 5021a792b1
commit ab8d92e1b8
3 changed files with 228 additions and 2 deletions
--- a/modules/calib3d/src/_modelest.h
+++ b/modules/calib3d/src/_modelest.h
@@ -45,7 +45,7 @@

 #include "precomp.hpp"

-class CvModelEstimator2
+class CV_EXPORTS CvModelEstimator2
 {
 public:
    CvModelEstimator2(int _modelPoints, CvSize _modelSize, int _maxBasicSolutions);
--- a/modules/calib3d/src/modelest.cpp
+++ b/modules/calib3d/src/modelest.cpp
@@ -351,7 +351,7 @@ bool CvModelEstimator2::checkSubset( const CvMat* m, int count )
            break;
    }

-    return i >= i1;
+    return i > i1;
 }