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

All modules (except ocl and gpu) compiles and pass tests

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-20 20:13:46 +04:00
parent 762aefd71b
commit 2ad7b97f1c
91 changed files with 606 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/objdetect/test/test_cascadeandhog.cpp
View File

@@ -122,7 +122,7 @@ int CV_DetectorTest::prepareData( FileStorage& _fs )
FileNodeIterator it = fn[DETECTOR_NAMES].begin();
for( ; it != fn[DETECTOR_NAMES].end(); )
{
string _name;
String _name;
it >> _name;
detectorNames.push_back(_name);
readDetector(fn[DETECTORS][_name]);
@@ -136,7 +136,7 @@ int CV_DetectorTest::prepareData( FileStorage& _fs )
{
for( FileNodeIterator it = fn[IMAGE_FILENAMES].begin(); it != fn[IMAGE_FILENAMES].end(); )
{
string filename;
String filename;
it >> filename;
imageFilenames.push_back(filename);
Mat img = imread( dataPath+filename, 1 );
@@ -402,7 +402,7 @@ CV_CascadeDetectorTest::CV_CascadeDetectorTest()
void CV_CascadeDetectorTest::readDetector( const FileNode& fn )
{
string filename;
String filename;
int flag;
fn[FILENAME] >> filename;
detectorFilenames.push_back(filename);
@@ -493,7 +493,7 @@ CV_HOGDetectorTest::CV_HOGDetectorTest()
void CV_HOGDetectorTest::readDetector( const FileNode& fn )
{
string filename;
String filename;
if( fn[FILENAME].node->data.seq != 0 )
fn[FILENAME] >> filename;
detectorFilenames.push_back( filename);

4
modules/objdetect/test/test_latentsvmdetector.cpp
View File

@@ -232,9 +232,9 @@ void LatentSVMDetectorTest::run( int /* start_from */)
// detector12 - to test case of two (several) classes 'cat' and car
// Load detectors
LatentSvmDetector detector1( vector<string>(1,model_path_cat) );
LatentSvmDetector detector1( vector<String>(1,model_path_cat) );
vector<string> models_pathes(2);
vector<String> models_pathes(2);
models_pathes[0] = model_path_cat;
models_pathes[1] = model_path_car;
LatentSvmDetector detector12( models_pathes );