updated to 2.0.0; some fixes for VS2008 SP1

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

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index a4a6a135a4d5eb9c3b0b3c29f88deafa5c59e2b4..4c04752f38ed9bc6d691babf455f520d8e22c1f1 100644 (file)
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -52,7 +52,7 @@ endif()
 # ----------------------------------------------------------------------------\r
 #  Current version number:\r
 # ----------------------------------------------------------------------------\r
-set(OPENCV_VERSION "1.2.0")\r
+set(OPENCV_VERSION "2.0.0")\r
 \r
 string(REGEX MATCHALL "[0-9]" OPENCV_VERSION_PARTS "${OPENCV_VERSION}")\r
 \r
@@ -549,6 +549,9 @@ if(MSVC)
     if(MSVC80)\r
         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
+    endif()\r
 \r
     set(EXTRA_EXE_LINKER_FLAGS_RELEASE "${EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug")\r
 \r

diff --git a/opencv/include/opencv/cvver.h b/opencv/include/opencv/cvver.h
index 779b740fb29566d705696769913e7332efb94eda..f49b9de4f953c92f8bb35f6e4ee9be0b0cef6fe4 100644 (file)
--- a/opencv/include/opencv/cvver.h
+++ b/opencv/include/opencv/cvver.h
@@ -47,8 +47,8 @@
 #ifndef _CVVERSION_H_
 #define _CVVERSION_H_
 
-#define CV_MAJOR_VERSION    1
-#define CV_MINOR_VERSION    2
+#define CV_MAJOR_VERSION    2
+#define CV_MINOR_VERSION    0
 #define CV_SUBMINOR_VERSION 0
 
 #define CVAUX_STR_EXP(__A)  #__A

diff --git a/opencv/include/opencv/cxtypes.h b/opencv/include/opencv/cxtypes.h
index 60aa2bffb69a4cc3341026b10d58ff088b2304bd..5bcee7cbd203b558f82c9ae994486f8198fbf949 100644 (file)
--- a/opencv/include/opencv/cxtypes.h
+++ b/opencv/include/opencv/cxtypes.h
@@ -47,6 +47,15 @@
 #define _CRT_SECURE_NO_DEPRECATE /* to avoid multiple Visual Studio 2005 warnings */
 #endif
 
+#if _MSC_VER >= 1500
+#ifndef _BIND_TO_CURRENT_CRT_VERSION
+  #define _BIND_TO_CURRENT_CRT_VERSION 1
+#endif
+#ifndef _BIND_TO_CURRENT_VCLIBS_VERSION
+  #define _BIND_TO_CURRENT_VCLIBS_VERSION 1
+#endif
+#endif
+
 #ifndef SKIP_INCLUDES
   #include <assert.h>
   #include <stdlib.h>