Merged the trunk till r8291

2012-05-18 12:18:17 +00:00
parent caddd398e6
commit 50ad690993
25 changed files with 143 additions and 64 deletions
--- a/modules/calib3d/test/test_chesscorners_timing.cpp
+++ b/modules/calib3d/test/test_chesscorners_timing.cpp
@@ -75,7 +75,6 @@ void CV_ChessboardDetectorTimingTest::run( int start_from )

    sprintf( filepath, "%scameracalibration/", ts->get_data_path().c_str() );
    sprintf( filename, "%schessboard_timing_list.dat", filepath );
-    printf("Reading file %s\n", filename);
    CvFileStorage* fs = cvOpenFileStorage( filename, 0, CV_STORAGE_READ );
    CvFileNode* board_list = fs ? cvGetFileNodeByName( fs, 0, "boards" ) : 0;