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

added todo for descriptors evaluation

Browse Source
This commit is contained in:
Maria Dimashova 2010-08-09 16:33:44 +00:00
parent 82a98521ed
commit c56085917b
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/features2d/src/evaluation.cpp
View File

@ -466,14 +466,24 @@ void cv::evaluateDescriptorMatch( const Mat& img1, const Mat& img2, const Mat& H
matches1to2 = _matches1to2 != 0 ? _matches1to2 : &buf1; matches1to2 = _matches1to2 != 0 ? _matches1to2 : &buf1;
correctMatches1to2Mask = _correctMatches1to2Mask != 0 ? _correctMatches1to2Mask : &buf2; correctMatches1to2Mask = _correctMatches1to2Mask != 0 ? _correctMatches1to2Mask : &buf2;
if( keypoints1.empty() || keypoints2.empty() ) if( keypoints1.empty() )
CV_Error( CV_StsBadArg, "keypoints1 and keypoints2 must be no empty" ); CV_Error( CV_StsBadArg, "keypoints1 must be no empty" );
if( matches1to2->empty() && dmatch.empty() ) if( matches1to2->empty() && dmatch.empty() )
CV_Error( CV_StsBadArg, "dmatch must be no empty when matches1to2 is empty" ); CV_Error( CV_StsBadArg, "dmatch must be no empty when matches1to2 is empty" );
if( matches1to2->empty() )
bool computeKeypoints2ByPrj = keypoints2.empty();
if( computeKeypoints2ByPrj )
{ {
assert(0);
// TODO: add computing keypoints2 from keypoints1 using H1to2
}
if( matches1to2->empty() || computeKeypoints2ByPrj )
{
dmatch->clear();
dmatch->add( img2, keypoints2 ); dmatch->add( img2, keypoints2 );
//TODO: use more sophisticated strategy to choose threshold // TODO: use more sophisticated strategy to choose threshold
dmatch->match( img1, keypoints1, *matches1to2, std::numeric_limits<float>::max() ); dmatch->match( img1, keypoints1, *matches1to2, std::numeric_limits<float>::max() );
} }
float repeatability; float repeatability;