generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed 8-point case in findFundamentalMat (ticket #1262). findFundamentalMat needs to be rewritten actually (as well as findHomography)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-08-03 14:04:14 +00:00
parent 8b16dbe791
commit c57799a877
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/core/src/lapack.cpp
View File

@@ -1637,14 +1637,31 @@ CV_IMPL void
cvEigenVV( CvArr* srcarr, CvArr* evectsarr, CvArr* evalsarr, double,
int lowindex, int highindex)
{
cv::Mat src = cv::cvarrToMat(srcarr), evals = cv::cvarrToMat(evalsarr);
cv::Mat src = cv::cvarrToMat(srcarr), evals0 = cv::cvarrToMat(evalsarr), evals = evals0;
if( evectsarr )
{
cv::Mat evects = cv::cvarrToMat(evectsarr);
cv::Mat evects0 = cv::cvarrToMat(evectsarr), evects = evects0;
eigen(src, evals, evects, lowindex, highindex);
if( evects0.data != evects.data )
{
uchar* p = evects0.data;
evects.convertTo(evects0, evects0.type());
CV_Assert( p == evects0.data );
}
}
else
eigen(src, evals, lowindex, highindex);
if( evals0.data != evals.data )
{
uchar* p = evals0.data;
if( evals0.size() == evals.size() )
evals.convertTo(evals0, evals0.type());
else if( evals0.type() == evals.type() )
cv::transpose(evals, evals0);
else
cv::Mat(evals.t()).convertTo(evals0, evals0.type());
CV_Assert( p == evals0.data );
}
}