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

changed testdata path for calib3d

Browse Source
This commit is contained in:
Konstantin Matskevich 2014-01-15 15:08:09 +04:00
parent a164381cc6
commit ab18c2d132
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/calib3d/test/test_cameracalibration.cpp
View File

@ -337,7 +337,7 @@ void CV_CameraCalibrationTest::run( int start_from )
int progress = 0; int progress = 0;
int values_read = -1; int values_read = -1;
sprintf( filepath, "%scameracalibration/", ts->get_data_path().c_str() ); sprintf( filepath, "%scv/cameracalibration/", ts->get_data_path().c_str() );
sprintf( filename, "%sdatafiles.txt", filepath ); sprintf( filename, "%sdatafiles.txt", filepath );
datafile = fopen( filename, "r" ); datafile = fopen( filename, "r" );
if( datafile == 0 ) if( datafile == 0 )
@ -1384,7 +1384,7 @@ void CV_StereoCalibrationTest::run( int )
{ {
char filepath[1000]; char filepath[1000];
char buf[1000]; char buf[1000];
sprintf( filepath, "%sstereo/case%d/stereo_calib.txt", ts->get_data_path().c_str(), testcase ); sprintf( filepath, "%scv/stereo/case%d/stereo_calib.txt", ts->get_data_path().c_str(), testcase );
f = fopen(filepath, "rt"); f = fopen(filepath, "rt");
Size patternSize; Size patternSize;
vector<string> imglist; vector<string> imglist;
@ -1405,7 +1405,7 @@ void CV_StereoCalibrationTest::run( int )
buf[--len] = '\0'; buf[--len] = '\0';
if( buf[0] == '#') if( buf[0] == '#')
continue; continue;
sprintf(filepath, "%sstereo/case%d/%s", ts->get_data_path().c_str(), testcase, buf ); sprintf(filepath, "%scv/stereo/case%d/%s", ts->get_data_path().c_str(), testcase, buf );
imglist.push_back(string(filepath)); imglist.push_back(string(filepath));
} }
fclose(f); fclose(f);

6
modules/calib3d/test/test_chesscorners.cpp
View File

@ -185,13 +185,13 @@ void CV_ChessboardDetectorTest::run_batch( const string& filename )
switch( pattern ) switch( pattern )
{ {
case CHESSBOARD: case CHESSBOARD:
folder = string(ts->get_data_path()) + "cameracalibration/"; folder = string(ts->get_data_path()) + "cv/cameracalibration/";
break; break;
case CIRCLES_GRID: case CIRCLES_GRID:
folder = string(ts->get_data_path()) + "cameracalibration/circles/"; folder = string(ts->get_data_path()) + "cv/cameracalibration/circles/";
break; break;
case ASYMMETRIC_CIRCLES_GRID: case ASYMMETRIC_CIRCLES_GRID:
folder = string(ts->get_data_path()) + "cameracalibration/asymmetric_circles/"; folder = string(ts->get_data_path()) + "cv/cameracalibration/asymmetric_circles/";
break; break;
} }

2
modules/calib3d/test/test_chesscorners_timing.cpp
View File

@ -75,7 +75,7 @@ void CV_ChessboardDetectorTimingTest::run( int start_from )
int idx, max_idx; int idx, max_idx;
int progress = 0; int progress = 0;
sprintf( filepath, "%scameracalibration/", ts->get_data_path().c_str() ); sprintf( filepath, "%scv/cameracalibration/", ts->get_data_path().c_str() );
sprintf( filename, "%schessboard_timing_list.dat", filepath ); sprintf( filename, "%schessboard_timing_list.dat", filepath );
CvFileStorage* fs = cvOpenFileStorage( filename, 0, CV_STORAGE_READ ); CvFileStorage* fs = cvOpenFileStorage( filename, 0, CV_STORAGE_READ );
CvFileNode* board_list = fs ? cvGetFileNodeByName( fs, 0, "boards" ) : 0; CvFileNode* board_list = fs ? cvGetFileNodeByName( fs, 0, "boards" ) : 0;

2
modules/calib3d/test/test_main.cpp
View File

@ -1,3 +1,3 @@
#include "test_precomp.hpp" #include "test_precomp.hpp"
CV_TEST_MAIN("cv") CV_TEST_MAIN("")

2
modules/calib3d/test/test_stereomatching.cpp
View File

@ -398,7 +398,7 @@ protected:
void CV_StereoMatchingTest::run(int) void CV_StereoMatchingTest::run(int)
{ {
string dataPath = ts->get_data_path(); string dataPath = ts->get_data_path() + "cv/";
string algorithmName = name; string algorithmName = name;
assert( !algorithmName.empty() ); assert( !algorithmName.empty() );
if( dataPath.empty() ) if( dataPath.empty() )