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

completed test: load LBP classifier

Browse Source
This commit is contained in:
Marina Kolpakova 2012-06-25 16:39:34 +00:00
parent 143c57064b
commit e637168e44
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/gpu/src/cascadeclassifier.cpp
View File

@ -97,16 +97,17 @@ cv::gpu::CascadeClassifier_GPU_LBP::~CascadeClassifier_GPU_LBP()
{ {
} }
bool cv::gpu::CascadeClassifier_GPU_LBP::empty() const { throw_nogpu(); return true; } bool cv::gpu::CascadeClassifier_GPU_LBP::empty() const
{
return stage_mat.empty();
}
bool cv::gpu::CascadeClassifier_GPU_LBP::load(const string& classifierAsXml) bool cv::gpu::CascadeClassifier_GPU_LBP::load(const string& classifierAsXml)
{ {
FileStorage fs(classifierAsXml, FileStorage::READ); FileStorage fs(classifierAsXml, FileStorage::READ);
if (!fs.isOpened()) if (!fs.isOpened())
return false; return false;
if (read(fs.getFirstTopLevelNode())) return read(fs.getFirstTopLevelNode());
return true;
return false;
} }
#define GPU_CC_STAGE_TYPE "stageType" #define GPU_CC_STAGE_TYPE "stageType"
@ -162,7 +163,6 @@ bool CascadeClassifier_GPU_LBP::read(const FileNode &root)
std::vector<int> subsets; std::vector<int> subsets;
FileNodeIterator it = fn.begin(), it_end = fn.end(); FileNodeIterator it = fn.begin(), it_end = fn.end();
int i = 0;
for (size_t si = 0; it != it_end; si++, ++it ) for (size_t si = 0; it != it_end; si++, ++it )
{ {
FileNode fns = *it; FileNode fns = *it;
@ -254,9 +254,15 @@ bool CascadeClassifier_GPU_LBP::read(const FileNode &root)
#undef GPU_CC_INTERNAL_NODES #undef GPU_CC_INTERNAL_NODES
#undef GPU_CC_LEAF_VALUES #undef GPU_CC_LEAF_VALUES
Size cv::gpu::CascadeClassifier_GPU_LBP::getClassifierSize() const { throw_nogpu(); return Size(); } Size cv::gpu::CascadeClassifier_GPU_LBP::getClassifierSize() const
{
return NxM;
}
int cv::gpu::CascadeClassifier_GPU_LBP::detectMultiScale( const GpuMat& , GpuMat& , double , int , Size) { throw_nogpu(); return 0; } int cv::gpu::CascadeClassifier_GPU_LBP::detectMultiScale(const GpuMat& image, GpuMat& objectsBuf, double scaleFactor=1.2, int minNeighbors=4, Size minSize=Size())
{
return 0;
}
// ============ old fashioned haar cascade ==============================================// // ============ old fashioned haar cascade ==============================================//
struct cv::gpu::CascadeClassifier_GPU::CascadeClassifierImpl struct cv::gpu::CascadeClassifier_GPU::CascadeClassifierImpl

3
modules/gpu/test/test_objdetect.cpp
View File

@ -299,9 +299,8 @@ PARAM_TEST_CASE(LBP_Read_classifier, cv::gpu::DeviceInfo, int)
TEST_P(LBP_Read_classifier, Accuracy) TEST_P(LBP_Read_classifier, Accuracy)
{ {
cv::gpu::CascadeClassifier_GPU_LBP classifier; cv::gpu::CascadeClassifier_GPU_LBP classifier;
std::cout << (std::string(cvtest::TS::ptr()->get_data_path()) + "lbpcascade/lbpcascade_frontalface.xml") << std::endl;
std::string classifierXmlPath = std::string(cvtest::TS::ptr()->get_data_path()) + "lbpcascade/lbpcascade_frontalface.xml"; std::string classifierXmlPath = std::string(cvtest::TS::ptr()->get_data_path()) + "lbpcascade/lbpcascade_frontalface.xml";
classifier.load(classifierXmlPath); ASSERT_TRUE(classifier.load(classifierXmlPath));
} }
INSTANTIATE_TEST_CASE_P(GPU_ObjDetect, LBP_Read_classifier, testing::Combine( INSTANTIATE_TEST_CASE_P(GPU_ObjDetect, LBP_Read_classifier, testing::Combine(