X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=modules%2Fcore%2Finclude%2Fopencv2%2Fcore%2Fversion.hpp;h=e752a870f3a78f9b2e22109dc26f2c8f381d84be;hb=ae4cb571ab4fdca3c7be57f0de19743f823daf3f;hp=99241a9fa23a93d3c9b80acc3bd253536f1e64f0;hpb=641bb7ac6bd423d89fb9a45cb1d5c42155515e8a;p=profile%2Fivi%2Fopencv.git

diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp
index 99241a9..e752a87 100644
--- a/modules/core/include/opencv2/core/version.hpp
+++ b/modules/core/include/opencv2/core/version.hpp
@@ -11,6 +11,7 @@
 //                For Open Source Computer Vision Library
 //
 // Copyright( C) 2000, Intel Corporation, all rights reserved.
+// Copyright (C) 2011-2013, NVIDIA Corporation, all rights reserved.
 // Third party copyrights are property of their respective owners.
 //
 // Redistribution and use in source and binary forms, with or without modification,
@@ -47,10 +48,10 @@
 #ifndef __OPENCV_VERSION_HPP__
 #define __OPENCV_VERSION_HPP__
 
-#define CV_VERSION_EPOCH    2
-#define CV_VERSION_MAJOR    4
-#define CV_VERSION_MINOR    7
+#define CV_VERSION_MAJOR    3
+#define CV_VERSION_MINOR    0
 #define CV_VERSION_REVISION 0
+#define CV_VERSION_STATUS   "-beta"
 
 #define CVAUX_STR_EXP(__A)  #__A
 #define CVAUX_STR(__A)      CVAUX_STR_EXP(__A)
@@ -58,15 +59,11 @@
 #define CVAUX_STRW_EXP(__A)  L#__A
 #define CVAUX_STRW(__A)      CVAUX_STRW_EXP(__A)
 
-#if CV_VERSION_REVISION
-#  define CV_VERSION        CVAUX_STR(CV_VERSION_EPOCH) "." CVAUX_STR(CV_VERSION_MAJOR) "." CVAUX_STR(CV_VERSION_MINOR) "." CVAUX_STR(CV_VERSION_REVISION)
-#else
-#  define CV_VERSION        CVAUX_STR(CV_VERSION_EPOCH) "." CVAUX_STR(CV_VERSION_MAJOR) "." CVAUX_STR(CV_VERSION_MINOR)
-#endif
+#define CV_VERSION          CVAUX_STR(CV_VERSION_MAJOR) "." CVAUX_STR(CV_VERSION_MINOR) "." CVAUX_STR(CV_VERSION_REVISION) CV_VERSION_STATUS
 
 /* old  style version constants*/
-#define CV_MAJOR_VERSION    CV_VERSION_EPOCH
-#define CV_MINOR_VERSION    CV_VERSION_MAJOR
-#define CV_SUBMINOR_VERSION CV_VERSION_MINOR
+#define CV_MAJOR_VERSION    CV_VERSION_MAJOR
+#define CV_MINOR_VERSION    CV_VERSION_MINOR
+#define CV_SUBMINOR_VERSION CV_VERSION_REVISION
 
 #endif