Skip to content

O
opencv
Commit 28a7be69 authored by jmbuena's avatar jmbuena
Browse files
Options

Fixed compile warnings on CvHomographyEstimator

parent 6d738f6a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 15 deletions
modules/calib3d/src/_modelest.h
View file @ 28a7be69
...@@ -69,7 +69,7 @@ protected: ...@@ -69,7 +69,7 @@ protected:
virtual bool getSubset( const CvMat* m1, const CvMat* m2, virtual bool getSubset( const CvMat* m1, const CvMat* m2,
CvMat* ms1, CvMat* ms2, int maxAttempts=1000 ); CvMat* ms1, CvMat* ms2, int maxAttempts=1000 );
virtual bool checkSubset( const CvMat* ms1, int count ); 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; CvRNG rng;
int modelPoints; int modelPoints;
......
modules/calib3d/src/fundam.cpp
View file @ 28a7be69
...@@ -69,6 +69,7 @@ protected: ...@@ -69,6 +69,7 @@ protected:
virtual void computeReprojError( const CvMat* m1, const CvMat* m2, virtual void computeReprojError( const CvMat* m1, const CvMat* m2,
const CvMat* model, CvMat* error ); const CvMat* model, CvMat* error );
virtual bool isMinimalSetConsistent( const CvMat* m1, const CvMat* m2 ); 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, ...@@ -297,15 +298,8 @@ cvFindHomography( const CvMat* objectPoints, const CvMat* imagePoints,
// "Speeding-up homography estimation in mobile devices" // "Speeding-up homography estimation in mobile devices"
// Journal of Real-Time Image Processing. 2013. DOI: 10.1007/s11554-012-0314-1 // 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 // Pablo Marquez-Neila, Javier Lopez-Alberca, Jose M. Buenaposada, Luis Baumela
CV_IMPL bool bool
weakConstraint CvHomographyEstimator::weakConstraint ( const CvMat* srcPoints, const CvMat* dstPoints, int t1, int t2, int t3 )
(
const CvMat* srcPoints,
const CvMat* dstPoints,
int t1,
int t2,
int t3
)
{ {
const CvPoint2D64f* src = (const CvPoint2D64f*)srcPoints->data.ptr; const CvPoint2D64f* src = (const CvPoint2D64f*)srcPoints->data.ptr;
const CvPoint2D64f* dst = (const CvPoint2D64f*)dstPoints->data.ptr; const CvPoint2D64f* dst = (const CvPoint2D64f*)dstPoints->data.ptr;
...@@ -355,11 +349,7 @@ weakConstraint ...@@ -355,11 +349,7 @@ weakConstraint
// Journal of Real-Time Image Processing. 2013. DOI: 10.1007/s11554-012-0314-1 // 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 // Pablo Marquez-Neila, Javier Lopez-Alberca, Jose M. Buenaposada, Luis Baumela
bool bool
CvHomographyEstimator::isMinimalSetConsistent CvHomographyEstimator::isMinimalSetConsistent ( const CvMat* srcPoints, const CvMat* dstPoints )
(
const CvMat* srcPoints,
const CvMat* dstPoints
)
{ {
return weakConstraint(srcPoints, dstPoints, 0, 1, 2) && return weakConstraint(srcPoints, dstPoints, 0, 1, 2) &&
weakConstraint(srcPoints, dstPoints, 1, 2, 3) && weakConstraint(srcPoints, dstPoints, 1, 2, 3) &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment