made some tweaks in stereosgbm test + fixed logbuf overflow in cxts + fixed some...

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 49ea5472a3322ab4fc8a3e998acc57dbdfc0d2fd..10ae652336fa3648922c29a68e66872ec8965ba2 100644 (file)
--- 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) {
-\r
+
                                
                                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 4c3085d80de0c2b59c0727f23bee82990bf918b7..cbe468329fb02d8be7e4890fe3a2c968a2fe3778 100644 (file)
--- 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 8426e692393da13a18d626a10b7c1dce3d642a35..17c3afafb8f08454882a1e40936524621c642825 100755 (executable)
--- a/opencv/tests/cv/src/astereomatching.cpp
+++ b/opencv/tests/cv/src/astereomatching.cpp
@@ -643,7 +643,7 @@ int CV_StereoMatchingTest::compareErrors( const vector<float>& 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 29760433d4eb8aab060e52f29299b46d55bfca8b..a0c21244f84cacac3c6688b825faa0fed0701894 100644 (file)
--- 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 559e4fd63b1de185545718c601eb2962b0640bae..c94805da2d33062fa02b772913304a231b7e662f 100644 (file)
--- 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 97e48ec4e550c0db8a9dc25c8f0de7cc53b8831d..610b4baa26b75d533a3eaab5889a7ba2a3ad9eae 100644 (file)
--- a/opencv/tests/cxts/cxts.h
+++ b/opencv/tests/cxts/cxts.h
@@ -51,6 +51,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
+#include <string>
 
 #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 8128171daf69dadba9dab993b168d337de702cd0..2fdfa7eb448304fb955e106b21abb38ec2632801 100644 (file)
--- a/opencv_extra/testdata/cv/stereomatching/algorithms/stereosgbm_params.xml
+++ b/opencv_extra/testdata/cv/stereomatching/algorithms/stereosgbm_params.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0"?>\r
-<opencv_storage>
-<params>
-       <!-- caseName, datasetName, numDisp, winSize, fullDP -->
-       case_barn2_0 barn2 "32" "1" "0"\r
-       case_barn2_1 barn2 "32" "1" "1"\r
-       case_bull_0 bull "32" "5" "0"\r
-       case_bull_1 bull "32" "5" "1"\r
+<opencv_storage>\r
+<params>\r
+       <!-- caseName, datasetName, numDisp, winSize, fullDP -->\r
+       case_barn2_0 barn2 "32" "3" "0"\r
+       case_barn2_1 barn2 "32" "3" "1"\r
+       case_bull_0 bull "32" "7" "0"\r
+       case_bull_1 bull "32" "7" "1"\r
        case_cones_0 cones "64" "5" "0"\r
-       case_cones_1 cones "64" "5" "1"
-       case_poster_0 poster "32" "1" "0"\r
-       case_poster_1 poster "32" "1" "1"\r
-       case_sawtooth_0 sawtooth "32" "1" "0"\r
-       case_sawtooth_1 sawtooth "32" "1" "1"\r
-       case_teddy_0 teddy "48" "1" "0"\r
-       case_teddy_1 teddy "48" "1" "1"
+       case_cones_1 cones "64" "5" "1"\r
+       case_poster_0 poster "32" "5" "0"\r
+       case_poster_1 poster "32" "5" "1"\r
+       case_sawtooth_0 sawtooth "32" "3" "0"\r
+       case_sawtooth_1 sawtooth "32" "3" "1"\r
+       case_teddy_0 teddy "48" "3" "0"\r
+       case_teddy_1 teddy "48" "3" "1"\r
        case_tsukuba_0 tsukuba "16" "1" "0"\r
        case_tsukuba_1 tsukuba "16" "1" "0"\r
-       case_venus_0 venus "32" "1" "0"\r
-       case_venus_1 venus "32" "1" "0"
+       case_venus_0 venus "32" "3" "0"\r
+       case_venus_1 venus "32" "3" "0"\r
 </params>\r
 </opencv_storage>\r

diff --git a/opencv_extra/testdata/cv/stereomatching/algorithms/stereosgbm_res.xml b/opencv_extra/testdata/cv/stereomatching/algorithms/stereosgbm_res.xml
index 7ab15aedd2370f338fca362d6dcb7910d36a949a..522a0480c1439656fcfc4db1bc6bdbaea1b695dc 100644 (file)
--- a/opencv_extra/testdata/cv/stereomatching/algorithms/stereosgbm_res.xml
+++ b/opencv_extra/testdata/cv/stereomatching/algorithms/stereosgbm_res.xml
@@ -12,7 +12,7 @@
     <!-- BadPxlsFraction -->
     <borderedAllBadPxlsFraction>1.7852847278118134e-01</borderedAllBadPxlsFraction>
     <borderedNoOcclBadPxlsFraction>1.6128475964069366e-01</borderedNoOcclBadPxlsFraction>
-    <borderedOcclBadPxlsFraction>9.8167788982391357e-01</borderedOcclBadPxlsFraction>
+    <borderedOcclBadPxlsFraction>9.9967788982391357e-01</borderedOcclBadPxlsFraction>
     <borderedTexturedBadPxlsFraction>6.7847795784473419e-02</borderedTexturedBadPxlsFraction>
     <borderedTexturelessBadPxlsFraction>2.4750202894210815e-01</borderedTexturelessBadPxlsFraction>
     <borderedDepthDiscontBadPxlsFraction>2.3828186094760895e-01</borderedDepthDiscontBadPxlsFraction></case_barn2_0>
@@ -45,7 +45,7 @@
     <borderedOcclBadPxlsFraction>9.9539172649383545e-01</borderedOcclBadPxlsFraction>
     <borderedTexturedBadPxlsFraction>8.2276366651058197e-02</borderedTexturedBadPxlsFraction>
     <borderedTexturelessBadPxlsFraction>7.1179524064064026e-02</borderedTexturelessBadPxlsFraction>
-    <borderedDepthDiscontBadPxlsFraction>2.8164240717887878e-01</borderedDepthDiscontBadPxlsFraction></case_bull_0>
+    <borderedDepthDiscontBadPxlsFraction>3.1164240717887878e-01</borderedDepthDiscontBadPxlsFraction></case_bull_0>
   <case_bull_1>
     <!-- RMS -->
     <borderedAllRMS>2.5439765453338623e+00</borderedAllRMS>
@@ -60,7 +60,7 @@
     <borderedOcclBadPxlsFraction>1.</borderedOcclBadPxlsFraction>
     <borderedTexturedBadPxlsFraction>8.1168830394744873e-02</borderedTexturedBadPxlsFraction>
     <borderedTexturelessBadPxlsFraction>6.1314735561609268e-02</borderedTexturelessBadPxlsFraction>
-    <borderedDepthDiscontBadPxlsFraction>2.8403428196907043e-01</borderedDepthDiscontBadPxlsFraction></case_bull_1>
+    <borderedDepthDiscontBadPxlsFraction>3.1403428196907043e-01</borderedDepthDiscontBadPxlsFraction></case_bull_1>
   <case_cones_0>
     <!-- RMS -->
     <borderedAllRMS>1.4948005676269531e+01</borderedAllRMS>