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

Merge pull request #2151 from KonstantinMatskevich:testdata_path_calib3d

Browse Source
This commit is contained in:
Roman Donchenko 2014-01-16 16:44:24 +04:00 committed by OpenCV Buildbot
commit ddfd1854a7
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,8 +290,8 @@ int CV_CameraCalibrationTest::compare(double* val, double* ref_val, int len,
void CV_CameraCalibrationTest::run( int start_from ) void CV_CameraCalibrationTest::run( int start_from )
{ {
int code = cvtest::TS::OK; int code = cvtest::TS::OK;
char filepath[200]; cv::String filepath;
char filename[200]; cv::String filename;
CvSize imageSize; CvSize imageSize;
CvSize etalonSize; CvSize etalonSize;
@ -337,9 +337,9 @@ 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() ); filepath = cv::format("%scv/cameracalibration/", ts->get_data_path().c_str() );
sprintf( filename, "%sdatafiles.txt", filepath ); filename = cv::format("%sdatafiles.txt", filepath.c_str() );
datafile = fopen( filename, "r" ); datafile = fopen( filename.c_str(), "r" );
if( datafile == 0 ) if( datafile == 0 )
{ {
ts->printf( cvtest::TS::LOG, "Could not open file with list of test files: %s\n", filename ); ts->printf( cvtest::TS::LOG, "Could not open file with list of test files: %s\n", filename );
@ -354,8 +354,8 @@ void CV_CameraCalibrationTest::run( int start_from )
{ {
values_read = fscanf(datafile,"%s",i_dat_file); values_read = fscanf(datafile,"%s",i_dat_file);
CV_Assert(values_read == 1); CV_Assert(values_read == 1);
sprintf(filename, "%s%s", filepath, i_dat_file); filename = cv::format("%s%s", filepath.c_str(), i_dat_file);
file = fopen(filename,"r"); file = fopen(filename.c_str(),"r");
ts->update_context( this, currTest, true ); ts->update_context( this, currTest, true );
@ -1382,10 +1382,10 @@ void CV_StereoCalibrationTest::run( int )
for(int testcase = 1; testcase <= ntests; testcase++) for(int testcase = 1; testcase <= ntests; testcase++)
{ {
char filepath[1000]; cv::String filepath;
char buf[1000]; char buf[1000];
sprintf( filepath, "%sstereo/case%d/stereo_calib.txt", ts->get_data_path().c_str(), testcase ); filepath = cv::format("%scv/stereo/case%d/stereo_calib.txt", ts->get_data_path().c_str(), testcase );
f = fopen(filepath, "rt"); f = fopen(filepath.c_str(), "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 ); filepath = cv::format("%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;
} }

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

@ -62,8 +62,8 @@ void CV_ChessboardDetectorTimingTest::run( int start_from )
int code = cvtest::TS::OK; int code = cvtest::TS::OK;
/* test parameters */ /* test parameters */
char filepath[1000]; std::string filepath;
char filename[1000]; std::string filename;
CvMat* _v = 0; CvMat* _v = 0;
CvPoint2D32f* v; CvPoint2D32f* v;
@ -75,9 +75,9 @@ 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() ); filepath = cv::format("%scv/cameracalibration/", ts->get_data_path().c_str() );
sprintf( filename, "%schessboard_timing_list.dat", filepath ); filename = cv::format("%schessboard_timing_list.dat", filepath.c_str() );
CvFileStorage* fs = cvOpenFileStorage( filename, 0, CV_STORAGE_READ ); CvFileStorage* fs = cvOpenFileStorage( filename.c_str(), 0, CV_STORAGE_READ );
CvFileNode* board_list = fs ? cvGetFileNodeByName( fs, 0, "boards" ) : 0; CvFileNode* board_list = fs ? cvGetFileNodeByName( fs, 0, "boards" ) : 0;
if( !fs || !board_list || !CV_NODE_IS_SEQ(board_list->tag) || if( !fs || !board_list || !CV_NODE_IS_SEQ(board_list->tag) ||
@ -105,7 +105,7 @@ void CV_ChessboardDetectorTimingTest::run( int start_from )
ts->update_context( this, idx-1, true ); ts->update_context( this, idx-1, true );
/* read the image */ /* read the image */
sprintf( filename, "%s%s", filepath, imgname ); filename = cv::format("%s%s", filepath.c_str(), imgname );
cv::Mat img2 = cv::imread( filename ); cv::Mat img2 = cv::imread( filename );
img = img2; img = img2;

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() )