with MSVC enable OpenMP only in Debug; disabled force inline because of compile error...

git-svn-id: https://code.ros.org/svn/opencv/trunk@2266 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index 85ca339e637bf3bf3424000dbaec938782b0a4ec..8995cc1c9245ac9dea31fcf49e13689f8bb1e482 100644 (file)
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -563,7 +563,7 @@ if(MSVC)
     endif()\r
 \r
     if(ENABLE_OPENMP)\r
-        set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} /openmp")\r
+        set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} /openmp")\r
     endif()\r
 \r
     # Remove unreferenced functions: function level linking\r

diff --git a/opencv/include/opencv/cxtypes.h b/opencv/include/opencv/cxtypes.h
index d85c995f971cb4fa459accd043bb1583472c5e13..b83921e4859da7c18085a6f8a93875ac9abe463b 100644 (file)
--- a/opencv/include/opencv/cxtypes.h
+++ b/opencv/include/opencv/cxtypes.h
@@ -154,14 +154,8 @@
 #endif /* CV_INLINE */
 
 #ifndef CV_FORCE_INLINE
-#if defined __GNUC__ && __GNUC__*10 + __GNUC_MINOR__ >= 31
-    #define CV_FORCE_INLINE __attribute__((always_inline))
-#elif defined _MSC_VER
-    #define CV_FORCE_INLINE __forceinline
-#else
     #define CV_FORCE_INLINE CV_INLINE
 #endif
-#endif
 
 #if (defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64 || defined WINCE) && defined CVAPI_EXPORTS
     #define CV_EXPORTS __declspec(dllexport)

diff --git a/opencv/tests/cxcore/src/amath.cpp b/opencv/tests/cxcore/src/amath.cpp
index 7dc2ba17b1bd92cd1207c773785c19f09b5f488d..0ca1e8df5c462fc8b73541683c9dc9a9b06694c2 100644 (file)
--- a/opencv/tests/cxcore/src/amath.cpp
+++ b/opencv/tests/cxcore/src/amath.cpp
@@ -1713,7 +1713,7 @@ void CxCore_PerspectiveTransformTest::get_test_array_types_and_sizes( int test_c
 double CxCore_PerspectiveTransformTest::get_success_error_level( int test_case_idx, int i, int j )
 {
     int depth = CV_MAT_DEPTH(test_mat[INPUT][0].type);
-    return depth == CV_32F ? 1e-4 : depth == CV_64F ? 1e-9 :
+    return depth == CV_32F ? 1e-4 : depth == CV_64F ? 1e-8 :
                CxCore_MatrixTest::get_success_error_level(test_case_idx, i, j);
 }
 

diff --git a/opencv/tests/cxts/cxts.cpp b/opencv/tests/cxts/cxts.cpp
index afc7563003a375ce49258bc0d4603f5b07fc1ce4..5f5f1dc09325b87db374c2773690c009eb4f6663 100644 (file)
--- a/opencv/tests/cxts/cxts.cpp
+++ b/opencv/tests/cxts/cxts.cpp
@@ -1409,6 +1409,8 @@ int CvTS::run( int argc, char** argv )
         if( memory_manager )
             memory_manager->start_tracking();
         update_context( test, -1, true );
+        current_test_info.rng_seed0 = current_test_info.rng_seed;
+        
         ostream_testname_mask = 0; // reset "test name was printed" flags
         if( output_streams[LOG_IDX].f )
             fflush( output_streams[LOG_IDX].f );
@@ -1692,6 +1694,9 @@ void CvTS::vprintf( int streams, const char* fmt, va_list l )
                     if( i != CSV_IDX && !(ostream_testname_mask & (1 << i)) && current_test_info.test )
                     {
                         fprintf( f, "-------------------------------------------------\n" );
+                        if( i == CONSOLE_IDX || i == SUMMARY_IDX )
+                                                       fprintf( f, "[%08x%08x]\n", (int)(current_test_info.rng_seed0 >> 32),
+                                                           (int)(current_test_info.rng_seed0));
                         fprintf( f, "%s: ", current_test_info.test->get_name() );
                         fflush( f );
                         ostream_testname_mask |= 1 << i;

diff --git a/opencv/tests/cxts/cxts.h b/opencv/tests/cxts/cxts.h
index a9a8d88341ae683140576ae57773fb63eec12dd0..b4b452a86b876fdd403bba4d9bd715b6fb1c993f 100644 (file)
--- a/opencv/tests/cxts/cxts.h
+++ b/opencv/tests/cxts/cxts.h
@@ -232,6 +232,9 @@ typedef struct CvTestInfo
 
     // seed value right before the data for the failed test case is prepared.
     uint64 rng_seed;
+    
+    // seed value right before running the test
+    uint64 rng_seed0;
 
     // index of test case, can be then passed to CvTest::proceed_to_test_case()
     int test_case_idx;