Revert "replaced sprintf with cv::format"

Fixing build breakage.

This reverts commit b83eff7ecf0a3a8a9d706168150d569c94f0b71e.

diff --git a/modules/calib3d/test/test_cameracalibration.cpp b/modules/calib3d/test/test_cameracalibration.cpp
index e9f5876..7262e61 100644 (file)
--- 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;
-    cv::String            filepath;
-    cv::String            filename;
+    char            filepath[200];
+    char            filename[200];
 
     CvSize          imageSize;
     CvSize          etalonSize;
@@ -337,9 +337,9 @@ void CV_CameraCalibrationTest::run( int start_from )
     int progress = 0;
     int values_read = -1;
 
-    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" );
+    sprintf( filepath, "%scv/cameracalibration/", ts->get_data_path().c_str() );
+    sprintf( filename, "%sdatafiles.txt", filepath );
+    datafile = fopen( filename, "r" );
     if( datafile == 0 )
     {
         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);
         CV_Assert(values_read == 1);
-        filename = cv::format("%s%s", filepath.c_str(), i_dat_file);
-        file = fopen(filename.c_str(),"r");
+        sprintf(filename, "%s%s", filepath, i_dat_file);
+        file = fopen(filename,"r");
 
         ts->update_context( this, currTest, true );
 
@@ -1382,10 +1382,10 @@ void CV_StereoCalibrationTest::run( int )
 
     for(int testcase = 1; testcase <= ntests; testcase++)
     {
-        cv::String filepath;
+        char filepath[1000];
         char buf[1000];
-        filepath = cv::format("%scv/stereo/case%d/stereo_calib.txt", ts->get_data_path().c_str(), testcase );
-        f = fopen(filepath.c_str(), "rt");
+        sprintf( filepath, "%scv/stereo/case%d/stereo_calib.txt", ts->get_data_path().c_str(), testcase );
+        f = fopen(filepath, "rt");
         Size patternSize;
         vector<string> imglist;
 
@@ -1405,7 +1405,7 @@ void CV_StereoCalibrationTest::run( int )
                 buf[--len] = '\0';
             if( buf[0] == '#')
                 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));
         }
         fclose(f);

diff --git a/modules/calib3d/test/test_chesscorners_timing.cpp b/modules/calib3d/test/test_chesscorners_timing.cpp
index 309e1ef..a990aea 100644 (file)
--- 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 */
-    std::string   filepath;
-    std::string   filename;
+    char   filepath[1000];
+    char   filename[1000];
 
     CvMat*  _v = 0;
     CvPoint2D32f* v;
@@ -75,9 +75,9 @@ void CV_ChessboardDetectorTimingTest::run( int start_from )
     int  idx, max_idx;
     int  progress = 0;
 
-    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 );
+    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 );
     CvFileNode* board_list = fs ? cvGetFileNodeByName( fs, 0, "boards" ) : 0;
 
     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 );
 
         /* read the image */
-        filename = cv::format("%s%s", filepath.c_str(), imgname );
+        sprintf( filename, "%s%s", filepath, imgname );
 
         cv::Mat img2 = cv::imread( filename );
         img = img2;