fixed warning; set the correct MSVC flags (/EHsc => /EHsc-) to enable smooth exceptio...

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

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index ea58843924eef6f04f5530719a2ead7aaccf3c50..f2b8178d8f6a4b276a4b33604887f0612cff7646 100644 (file)
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -563,7 +563,7 @@ if(MSVC)
         set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} /Wp64")\r
     endif()\r
     if(MSVC90)\r
-    set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} /D _BIND_TO_CURRENT_CRT_VERSION=1 /D _BIND_TO_CURRENT_VCLIBS_VERSION=1")\r
+        set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} /D _BIND_TO_CURRENT_CRT_VERSION=1 /D _BIND_TO_CURRENT_VCLIBS_VERSION=1")\r
     endif()\r
 \r
     set(EXTRA_EXE_LINKER_FLAGS_RELEASE "${EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug")\r
@@ -704,6 +704,14 @@ if (WIN32 AND MSVC)
     string(REPLACE "/W3" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")\r
     string(REPLACE "/W3" "/W4" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")\r
     string(REPLACE "/W3" "/W4" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")\r
+\r
+    # allow extern "C" functions throw exceptions\r
+    string(REPLACE "/EHsc" "/EHsc-" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")\r
+    string(REPLACE "/EHsc" "/EHsc-" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")\r
+    string(REPLACE "/EHsc" "/EHsc-" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")\r
+    string(REPLACE "/EHsc" "/EHsc-" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")\r
+    string(REPLACE "/EHsc" "/EHsc-" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")\r
+    string(REPLACE "/EHsc" "/EHsc-" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")\r
 endif()\r
 \r
 if("${CMAKE_CONFIGURE_LDFLAGS}")\r

diff --git a/opencv/src/cv/cvmatchcontours.cpp b/opencv/src/cv/cvmatchcontours.cpp
index c0df393812e388f84636f7a633cb381d6e0d1664..977a1b275ca948e9d7758524e0b3e4176549c62d 100644 (file)
--- a/opencv/src/cv/cvmatchcontours.cpp
+++ b/opencv/src/cv/cvmatchcontours.cpp
@@ -224,7 +224,6 @@ cvMatchContourTrees( const CvContourTree* tree1, const CvContourTree* tree2,
     char s1, s2;
     _CvTrianAttr tree_1, tree_2;        /*current vertex 1 and 2 tree */
     CvSeqReader reader1, reader2;
-    double result = 0;
 
     if( !tree1 || !tree2 )
         CV_Error( CV_StsNullPtr, "" );