From: vp153 Date: Wed, 17 Mar 2010 23:49:03 +0000 (+0000) Subject: made some tweaks in stereosgbm test + fixed logbuf overflow in cxts + fixed some... X-Git-Url: https://rtime.felk.cvut.cz/gitweb/opencv.git/commitdiff_plain/d96033180bf570cbeeacb9a5ce7fb96dd7830227 made some tweaks in stereosgbm test + fixed logbuf overflow in cxts + fixed some compiler warnings git-svn-id: https://code.ros.org/svn/opencv/trunk@2846 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08 --- diff --git a/opencv/src/cvaux/cvcalonder.cpp b/opencv/src/cvaux/cvcalonder.cpp index 49ea5472..10ae6523 100644 --- a/opencv/src/cvaux/cvcalonder.cpp +++ b/opencv/src/cvaux/cvcalonder.cpp @@ -169,7 +169,7 @@ namespace cv { int class_id = 0; for (keypt_it = base_set.begin(); keypt_it != base_set.end(); ++keypt_it, ++class_id) { for (int i = 0; i < views; ++i) { - + make_patch(keypt_it->image, Point2f(keypt_it->x,keypt_it->y) ,patch, Size(PATCH_SIZE,PATCH_SIZE),rng); @@ -1000,6 +1000,4 @@ namespace cv { } //} // namespace features - - -} \ No newline at end of file +} diff --git a/opencv/tests/cv/src/amser.cpp b/opencv/tests/cv/src/amser.cpp index 4c3085d8..cbe46832 100644 --- a/opencv/tests/cv/src/amser.cpp +++ b/opencv/tests/cv/src/amser.cpp @@ -198,4 +198,4 @@ void CV_MserTest::run(int) cvReleaseImage(&img); } -CV_MserTest mser_test; \ No newline at end of file +CV_MserTest mser_test; diff --git a/opencv/tests/cv/src/astereomatching.cpp b/opencv/tests/cv/src/astereomatching.cpp index 8426e692..17c3afaf 100755 --- a/opencv/tests/cv/src/astereomatching.cpp +++ b/opencv/tests/cv/src/astereomatching.cpp @@ -643,7 +643,7 @@ int CV_StereoMatchingTest::compareErrors( const vector& calcErrors, const epsIt = eps.begin(); bool ok = true; for( int i = 0; i < ERROR_KINDS_COUNT; i++, ++calcIt, ++validIt, ++epsIt ) - if( fabs(*calcIt - *validIt) > *epsIt ) + if( *calcIt - *validIt > *epsIt ) { ts->printf( CvTS::LOG, "bad accuracy of %s (valid=%f; calc=%f)\n", string(ERROR_PREFIXES[i]+errName).c_str(), *validIt, *calcIt ); ok = false; @@ -809,7 +809,7 @@ protected: { RunParams params = caseRunParams[caseIdx]; assert( params.ndisp%16 == 0 ); - StereoSGBM sgbm( 0, params.ndisp, params.winSize, 6*params.winSize*params.winSize, 15*params.winSize*params.winSize, + StereoSGBM sgbm( 0, params.ndisp, params.winSize, 10*params.winSize*params.winSize, 40*params.winSize*params.winSize, 1, 63, 10, 100, 32, params.fullDP ); sgbm( leftImg, rightImg, leftDisp ); assert( leftDisp.type() == CV_16SC1 ); diff --git a/opencv/tests/cv/src/bundistort.cpp b/opencv/tests/cv/src/bundistort.cpp index 29760433..a0c21244 100644 --- a/opencv/tests/cv/src/bundistort.cpp +++ b/opencv/tests/cv/src/bundistort.cpp @@ -519,6 +519,4 @@ void CV_UndistortBadArgTest::run(int) CV_UndistortBadArgTest undistort_badarg_test; - - -/* End of file. */ \ No newline at end of file +/* End of file. */ diff --git a/opencv/tests/cxts/cxts.cpp b/opencv/tests/cxts/cxts.cpp index 559e4fd6..c94805da 100644 --- a/opencv/tests/cxts/cxts.cpp +++ b/opencv/tests/cxts/cxts.cpp @@ -1035,9 +1035,6 @@ CvTS::CvTS() selected_tests = new CvTestPtrVec(); failed_tests = new CvTestInfoVec(); written_params = new CvTestPtrVec(); - logbufsize = 1 << 18; // 256K - logbufpos = 0; - logbuf = new char[logbufsize]; clear(); } @@ -1107,7 +1104,6 @@ CvTS::~CvTS() delete selected_tests; delete failed_tests; - delete[] logbuf; } @@ -1496,7 +1492,7 @@ int CvTS::run( int argc, char** argv ) current_test_info.rng_seed0 = current_test_info.rng_seed; ostream_testname_mask = 0; // reset "test name was printed" flags - logbufpos = 0; + logbuf = std::string(); if( output_streams[LOG_IDX].f ) fflush( output_streams[LOG_IDX].f ); @@ -1533,10 +1529,9 @@ int CvTS::run( int argc, char** argv ) current_test_info.test_case_idx, (unsigned)(current_test_info.rng_seed>>32), (unsigned)(current_test_info.rng_seed)); - if(logbufpos > 0) + if(logbuf.size() > 0) { - logbuf[logbufpos] = '\0'; - printf( SUMMARY + CONSOLE, ">>>\n%s\n", logbuf); + printf( SUMMARY + CONSOLE, ">>>\n%s\n", logbuf.c_str()); } failed_tests->push(current_test_info); if( params.rerun_immediately ) @@ -1782,7 +1777,7 @@ void CvTS::vprintf( int streams, const char* fmt, va_list l ) if( streams ) { char str[1 << 14]; - vsprintf( str, fmt, l ); + vsnprintf( str, sizeof(str)-1, fmt, l ); for( int i = 0; i < MAX_IDX; i++ ) { @@ -1802,16 +1797,11 @@ void CvTS::vprintf( int streams, const char* fmt, va_list l ) fflush( f ); ostream_testname_mask |= 1 << i; if( i == LOG_IDX ) - logbufpos = 0; + logbuf = std::string(); } fputs( str, f ); if( i == LOG_IDX ) - { - size_t len = strlen(str); - CV_Assert(logbufpos + len < logbufsize); - strcpy(logbuf + logbufpos, str); - logbufpos += len; - } + logbuf += std::string(str); if( i == CONSOLE_IDX ) fflush(f); } diff --git a/opencv/tests/cxts/cxts.h b/opencv/tests/cxts/cxts.h index 97e48ec4..610b4baa 100644 --- a/opencv/tests/cxts/cxts.h +++ b/opencv/tests/cxts/cxts.h @@ -51,6 +51,7 @@ #include #include #include +#include #if _MSC_VER >= 1200 #pragma warning( disable: 4710 ) @@ -554,9 +555,7 @@ protected: StreamInfo output_streams[MAX_IDX]; int ostream_testname_mask; - char* logbuf; - size_t logbufsize; - size_t logbufpos; + std::string logbuf; }; diff --git a/opencv_extra/testdata/cv/stereomatching/algorithms/stereosgbm_params.xml b/opencv_extra/testdata/cv/stereomatching/algorithms/stereosgbm_params.xml index 8128171d..2fdfa7eb 100644 --- a/opencv_extra/testdata/cv/stereomatching/algorithms/stereosgbm_params.xml +++ b/opencv_extra/testdata/cv/stereomatching/algorithms/stereosgbm_params.xml @@ -1,22 +1,22 @@ - - - - case_barn2_0 barn2 "32" "1" "0" - case_barn2_1 barn2 "32" "1" "1" - case_bull_0 bull "32" "5" "0" - case_bull_1 bull "32" "5" "1" + + + + case_barn2_0 barn2 "32" "3" "0" + case_barn2_1 barn2 "32" "3" "1" + case_bull_0 bull "32" "7" "0" + case_bull_1 bull "32" "7" "1" case_cones_0 cones "64" "5" "0" - case_cones_1 cones "64" "5" "1" - case_poster_0 poster "32" "1" "0" - case_poster_1 poster "32" "1" "1" - case_sawtooth_0 sawtooth "32" "1" "0" - case_sawtooth_1 sawtooth "32" "1" "1" - case_teddy_0 teddy "48" "1" "0" - case_teddy_1 teddy "48" "1" "1" + case_cones_1 cones "64" "5" "1" + case_poster_0 poster "32" "5" "0" + case_poster_1 poster "32" "5" "1" + case_sawtooth_0 sawtooth "32" "3" "0" + case_sawtooth_1 sawtooth "32" "3" "1" + case_teddy_0 teddy "48" "3" "0" + case_teddy_1 teddy "48" "3" "1" case_tsukuba_0 tsukuba "16" "1" "0" case_tsukuba_1 tsukuba "16" "1" "0" - case_venus_0 venus "32" "1" "0" - case_venus_1 venus "32" "1" "0" + case_venus_0 venus "32" "3" "0" + case_venus_1 venus "32" "3" "0" diff --git a/opencv_extra/testdata/cv/stereomatching/algorithms/stereosgbm_res.xml b/opencv_extra/testdata/cv/stereomatching/algorithms/stereosgbm_res.xml index 7ab15aed..522a0480 100644 --- a/opencv_extra/testdata/cv/stereomatching/algorithms/stereosgbm_res.xml +++ b/opencv_extra/testdata/cv/stereomatching/algorithms/stereosgbm_res.xml @@ -12,7 +12,7 @@ 1.7852847278118134e-01 1.6128475964069366e-01 - 9.8167788982391357e-01 + 9.9967788982391357e-01 6.7847795784473419e-02 2.4750202894210815e-01 2.3828186094760895e-01 @@ -45,7 +45,7 @@ 9.9539172649383545e-01 8.2276366651058197e-02 7.1179524064064026e-02 - 2.8164240717887878e-01 + 3.1164240717887878e-01 2.5439765453338623e+00 @@ -60,7 +60,7 @@ 1. 8.1168830394744873e-02 6.1314735561609268e-02 - 2.8403428196907043e-01 + 3.1403428196907043e-01 1.4948005676269531e+01