Fixed compile warnings on CvHomographyEstimator

diff --git a/modules/calib3d/src/_modelest.h b/modules/calib3d/src/_modelest.h
index 9ce7371..2a94add 100644 (file)
--- a/modules/calib3d/src/_modelest.h
+++ b/modules/calib3d/src/_modelest.h
@@ -69,7 +69,7 @@ protected:
     virtual bool getSubset( const CvMat* m1, const CvMat* m2,
                             CvMat* ms1, CvMat* ms2, int maxAttempts=1000 );
     virtual bool checkSubset( const CvMat* ms1, int count );
-    virtual bool isMinimalSetConsistent( const CvMat* m1, const CvMat* m2 ) { return true; };
+    virtual bool isMinimalSetConsistent( const CvMat* /*m1*/, const CvMat* /*m2*/ ) { return true; };
 
     CvRNG rng;
     int modelPoints;

diff --git a/modules/calib3d/src/fundam.cpp b/modules/calib3d/src/fundam.cpp
index b2272df..f15dac1 100644 (file)
--- a/modules/calib3d/src/fundam.cpp
+++ b/modules/calib3d/src/fundam.cpp
@@ -69,6 +69,7 @@ protected:
     virtual void computeReprojError( const CvMat* m1, const CvMat* m2,
                                      const CvMat* model, CvMat* error );
     virtual bool isMinimalSetConsistent( const CvMat* m1, const CvMat* m2 );
+    virtual bool weakConstraint ( const CvMat* srcPoints, const CvMat* dstPoints, int t1, int t2, int t3 );
 };
 
 
@@ -297,15 +298,8 @@ cvFindHomography( const CvMat* objectPoints, const CvMat* imagePoints,
 // "Speeding-up homography estimation in mobile devices"
 // Journal of Real-Time Image Processing. 2013. DOI: 10.1007/s11554-012-0314-1
 // Pablo Marquez-Neila, Javier Lopez-Alberca, Jose M. Buenaposada, Luis Baumela
-CV_IMPL bool
-weakConstraint
-  (
-  const CvMat* srcPoints,
-  const CvMat* dstPoints,
-  int t1,
-  int t2,
-  int t3
-  )
+bool
+CvHomographyEstimator::weakConstraint ( const CvMat* srcPoints, const CvMat* dstPoints, int t1, int t2, int t3 )
 {
   const CvPoint2D64f* src = (const CvPoint2D64f*)srcPoints->data.ptr;
   const CvPoint2D64f* dst = (const CvPoint2D64f*)dstPoints->data.ptr;
@@ -355,11 +349,7 @@ weakConstraint
 // Journal of Real-Time Image Processing. 2013. DOI: 10.1007/s11554-012-0314-1
 // Pablo Marquez-Neila, Javier Lopez-Alberca, Jose M. Buenaposada, Luis Baumela
 bool
-CvHomographyEstimator::isMinimalSetConsistent
-  (
-  const CvMat* srcPoints,
-  const CvMat* dstPoints
-  )
+CvHomographyEstimator::isMinimalSetConsistent ( const CvMat* srcPoints, const CvMat* dstPoints )
 {
   return weakConstraint(srcPoints, dstPoints, 0, 1, 2) &&
          weakConstraint(srcPoints, dstPoints, 1, 2, 3) &&