From: Konstantin Matskevich Date: Thu, 16 Jan 2014 12:18:02 +0000 (+0400) Subject: replaced sprintf with cv::format X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~3549^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e9e9e00d45ab206e59aff30eab7d38e073dad789;p=platform%2Fupstream%2Fopencv.git replaced sprintf with cv::format --- diff --git a/modules/calib3d/test/test_cameracalibration.cpp b/modules/calib3d/test/test_cameracalibration.cpp index 7262e61..d1cbdb2 100644 --- a/modules/calib3d/test/test_cameracalibration.cpp +++ b/modules/calib3d/test/test_cameracalibration.cpp @@ -290,8 +290,8 @@ int CV_CameraCalibrationTest::compare(double* val, double* ref_val, int len, void CV_CameraCalibrationTest::run( int start_from ) { int code = cvtest::TS::OK; - char filepath[200]; - char filename[200]; + cv::String filepath; + cv::String filename; CvSize imageSize; CvSize etalonSize; @@ -337,12 +337,12 @@ void CV_CameraCalibrationTest::run( int start_from ) int progress = 0; int values_read = -1; - sprintf( filepath, "%scv/cameracalibration/", ts->get_data_path().c_str() ); - sprintf( filename, "%sdatafiles.txt", filepath ); - datafile = fopen( filename, "r" ); + filepath = cv::format("%scv/cameracalibration/", ts->get_data_path().c_str() ); + filename = cv::format("%sdatafiles.txt", filepath.c_str() ); + datafile = fopen( filename.c_str(), "r" ); 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.c_str() ); code = cvtest::TS::FAIL_MISSING_TEST_DATA; goto _exit_; } @@ -354,15 +354,15 @@ void CV_CameraCalibrationTest::run( int start_from ) { values_read = fscanf(datafile,"%s",i_dat_file); CV_Assert(values_read == 1); - sprintf(filename, "%s%s", filepath, i_dat_file); - file = fopen(filename,"r"); + filename = cv::format("%s%s", filepath.c_str(), i_dat_file); + file = fopen(filename.c_str(),"r"); ts->update_context( this, currTest, true ); if( file == 0 ) { ts->printf( cvtest::TS::LOG, - "Can't open current test file: %s\n",filename); + "Can't open current test file: %s\n",filename.c_str()); if( numTests == 1 ) { code = cvtest::TS::FAIL_MISSING_TEST_DATA; @@ -1382,16 +1382,16 @@ void CV_StereoCalibrationTest::run( int ) for(int testcase = 1; testcase <= ntests; testcase++) { - char filepath[1000]; + cv::String filepath; char buf[1000]; - sprintf( filepath, "%scv/stereo/case%d/stereo_calib.txt", ts->get_data_path().c_str(), testcase ); - f = fopen(filepath, "rt"); + filepath = cv::format("%scv/stereo/case%d/stereo_calib.txt", ts->get_data_path().c_str(), testcase ); + f = fopen(filepath.c_str(), "rt"); Size patternSize; vector imglist; if( !f || !fgets(buf, sizeof(buf)-3, f) || sscanf(buf, "%d%d", &patternSize.width, &patternSize.height) != 2 ) { - ts->printf( cvtest::TS::LOG, "The file %s can not be opened or has invalid content\n", filepath ); + ts->printf( cvtest::TS::LOG, "The file %s can not be opened or has invalid content\n", filepath.c_str() ); ts->set_failed_test_info( f ? cvtest::TS::FAIL_INVALID_TEST_DATA : cvtest::TS::FAIL_MISSING_TEST_DATA ); return; } @@ -1405,7 +1405,7 @@ void CV_StereoCalibrationTest::run( int ) buf[--len] = '\0'; if( buf[0] == '#') continue; - sprintf(filepath, "%scv/stereo/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)); } fclose(f); diff --git a/modules/calib3d/test/test_chesscorners_timing.cpp b/modules/calib3d/test/test_chesscorners_timing.cpp index a990aea..61287ab 100644 --- a/modules/calib3d/test/test_chesscorners_timing.cpp +++ b/modules/calib3d/test/test_chesscorners_timing.cpp @@ -62,8 +62,8 @@ void CV_ChessboardDetectorTimingTest::run( int start_from ) int code = cvtest::TS::OK; /* test parameters */ - char filepath[1000]; - char filename[1000]; + std::string filepath; + std::string filename; CvMat* _v = 0; CvPoint2D32f* v; @@ -75,9 +75,9 @@ void CV_ChessboardDetectorTimingTest::run( int start_from ) int idx, max_idx; int progress = 0; - sprintf( filepath, "%scv/cameracalibration/", ts->get_data_path().c_str() ); - sprintf( filename, "%schessboard_timing_list.dat", filepath ); - CvFileStorage* fs = cvOpenFileStorage( filename, 0, CV_STORAGE_READ ); + filepath = cv::format("%scv/cameracalibration/", ts->get_data_path().c_str() ); + filename = cv::format("%schessboard_timing_list.dat", filepath.c_str() ); + CvFileStorage* fs = cvOpenFileStorage( filename.c_str(), 0, CV_STORAGE_READ ); CvFileNode* board_list = fs ? cvGetFileNodeByName( fs, 0, "boards" ) : 0; if( !fs || !board_list || !CV_NODE_IS_SEQ(board_list->tag) || @@ -105,14 +105,14 @@ void CV_ChessboardDetectorTimingTest::run( int start_from ) ts->update_context( this, idx-1, true ); /* read the image */ - sprintf( filename, "%s%s", filepath, imgname ); + filename = cv::format("%s%s", filepath.c_str(), imgname ); cv::Mat img2 = cv::imread( filename ); img = img2; if( img2.empty() ) { - ts->printf( cvtest::TS::LOG, "one of chessboard images can't be read: %s\n", filename ); + ts->printf( cvtest::TS::LOG, "one of chessboard images can't be read: %s\n", filename.c_str() ); if( max_idx == 1 ) { code = cvtest::TS::FAIL_MISSING_TEST_DATA;