Commit 63c61b4b authored by Roman Donchenko's avatar Roman Donchenko

Revert "replaced sprintf with cv::format"

Fixing build breakage.

This reverts commit b83eff7e.
parent ddfd1854
...@@ -290,8 +290,8 @@ int CV_CameraCalibrationTest::compare(double* val, double* ref_val, int len, ...@@ -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;
cv::String filepath; char filepath[200];
cv::String filename; char filename[200];
CvSize imageSize; CvSize imageSize;
CvSize etalonSize; CvSize etalonSize;
...@@ -337,9 +337,9 @@ void CV_CameraCalibrationTest::run( int start_from ) ...@@ -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;
filepath = cv::format("%scv/cameracalibration/", ts->get_data_path().c_str() ); sprintf( filepath, "%scv/cameracalibration/", ts->get_data_path().c_str() );
filename = cv::format("%sdatafiles.txt", filepath.c_str() ); sprintf( filename, "%sdatafiles.txt", filepath );
datafile = fopen( filename.c_str(), "r" ); datafile = fopen( filename, "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 ) ...@@ -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);
filename = cv::format("%s%s", filepath.c_str(), i_dat_file); sprintf(filename, "%s%s", filepath, i_dat_file);
file = fopen(filename.c_str(),"r"); file = fopen(filename,"r");
ts->update_context( this, currTest, true ); ts->update_context( this, currTest, true );
...@@ -1382,10 +1382,10 @@ void CV_StereoCalibrationTest::run( int ) ...@@ -1382,10 +1382,10 @@ void CV_StereoCalibrationTest::run( int )
for(int testcase = 1; testcase <= ntests; testcase++) for(int testcase = 1; testcase <= ntests; testcase++)
{ {
cv::String filepath; char filepath[1000];
char buf[1000]; char buf[1000];
filepath = cv::format("%scv/stereo/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.c_str(), "rt"); f = fopen(filepath, "rt");
Size patternSize; Size patternSize;
vector<string> imglist; vector<string> imglist;
...@@ -1405,7 +1405,7 @@ void CV_StereoCalibrationTest::run( int ) ...@@ -1405,7 +1405,7 @@ void CV_StereoCalibrationTest::run( int )
buf[--len] = '\0'; buf[--len] = '\0';
if( buf[0] == '#') if( buf[0] == '#')
continue; continue;
filepath = cv::format("%scv/stereo/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);
......
...@@ -62,8 +62,8 @@ void CV_ChessboardDetectorTimingTest::run( int start_from ) ...@@ -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 */
std::string filepath; char filepath[1000];
std::string filename; char filename[1000];
CvMat* _v = 0; CvMat* _v = 0;
CvPoint2D32f* v; CvPoint2D32f* v;
...@@ -75,9 +75,9 @@ void CV_ChessboardDetectorTimingTest::run( int start_from ) ...@@ -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;
filepath = cv::format("%scv/cameracalibration/", ts->get_data_path().c_str() ); sprintf( filepath, "%scv/cameracalibration/", ts->get_data_path().c_str() );
filename = cv::format("%schessboard_timing_list.dat", filepath.c_str() ); sprintf( filename, "%schessboard_timing_list.dat", filepath );
CvFileStorage* fs = cvOpenFileStorage( filename.c_str(), 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;
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 ) ...@@ -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 */
filename = cv::format("%s%s", filepath.c_str(), imgname ); sprintf( filename, "%s%s", filepath, imgname );
cv::Mat img2 = cv::imread( filename ); cv::Mat img2 = cv::imread( filename );
img = img2; img = img2;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment