apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

issue #5: select default detector/descriptor if a not available one is set in config

Browse Source
This commit is contained in:
matlabbe 2015-08-07 23:29:52 -04:00
parent 730a0bad74
commit bcc74f4a80
1 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/Settings.cpp
View File

@ -643,6 +643,38 @@ Feature2D * Settings::createKeypointDetector()
} }
#endif #endif
#if CV_MAJOR_VERSION < 3
if(strategies.at(index).compare("AGAST") == 0 ||
strategies.at(index).compare("KAZE") == 0 ||
strategies.at(index).compare("AKAZE") == 0)
{
index = Settings::defaultFeature2D_1Detector().split(':').first().toInt();
UERROR("Find-Object is built with OpenCV 2 so "
"AGAST/KAZE/AKAZE cannot be used! Using default \"%s\" instead.",
strategies.at(index).toStdString().c_str());
}
#else
if(strategies.at(index).compare("Dense") == 0)
{
index = Settings::defaultFeature2D_1Detector().split(':').first().toInt();
UERROR("Find-Object is built with OpenCV 3 so "
"Dense cannot be used! Using default \"%s\" instead.",
strategies.at(index).toStdString().c_str());
}
#ifndef HAVE_OPENCV_XFEATURES2D
if(strategies.at(index).compare("Star") == 0)
{
index = Settings::defaultFeature2D_1Detector().split(':').first().toInt();
UERROR("Find-Object is not built with OpenCV xfeatures2d module so "
"Star cannot be used! Using default \"%s\" instead.",
strategies.at(index).toStdString().c_str());
}
#endif
#endif
if(strategies.at(index).compare("Dense") == 0) if(strategies.at(index).compare("Dense") == 0)
{ {
#if CV_MAJOR_VERSION < 3 #if CV_MAJOR_VERSION < 3
@ -947,6 +979,33 @@ Feature2D * Settings::createDescriptorExtractor()
} }
#endif #endif
#if CV_MAJOR_VERSION < 3
if(strategies.at(index).compare("KAZE") == 0 ||
strategies.at(index).compare("AKAZE") == 0)
{
index = Settings::defaultFeature2D_2Descriptor().split(':').first().toInt();
UERROR("Find-Object is built with OpenCV 2 so "
"KAZE/AKAZE cannot be used! Using default \"%s\" instead.",
strategies.at(index).toStdString().c_str());
}
#else
#ifndef HAVE_OPENCV_XFEATURES2D
if(strategies.at(index).compare("Brief") == 0 ||
strategies.at(index).compare("FREAK") == 0 ||
strategies.at(index).compare("LUCID") == 0 ||
strategies.at(index).compare("LATCH") == 0 ||
strategies.at(index).compare("DAISY") == 0)
{
index = Settings::defaultFeature2D_2Descriptor().split(':').first().toInt();
UERROR("Find-Object is not built with OpenCV xfeatures2d module so "
"Brief/FREAK/LUCID/LATCH/DAISY cannot be used! Using default \"%s\" instead.",
strategies.at(index).toStdString().c_str());
}
#endif
#endif
if(strategies.at(index).compare("Brief") == 0) if(strategies.at(index).compare("Brief") == 0)
{ {
#if CV_MAJOR_VERSION < 3 #if CV_MAJOR_VERSION < 3