pre: OpenCV 4.7.0 (version++)
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 15 Dec 2022 22:08:46 +0000 (22:08 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 25 Dec 2022 17:00:22 +0000 (17:00 +0000)
doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown
modules/core/include/opencv2/core/version.hpp
modules/dnn/include/opencv2/dnn/version.hpp
modules/python/package/setup.py
platforms/maven/opencv-it/pom.xml
platforms/maven/opencv/pom.xml
platforms/maven/pom.xml

index ccef42a482c6feb0687608d4829f4fa4aa511d8d..b77891cee9a981307c120c8a96a0ac1e9536b15f 100644 (file)
@@ -46,14 +46,14 @@ Open your Doxyfile using your favorite text editor and search for the key
 `TAGFILES`. Change it as follows:
 
 @code
-TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.6.0
+TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.7.0
 @endcode
 
 If you had other definitions already, you can append the line using a `\`:
 
 @code
 TAGFILES = ./docs/doxygen-tags/libstdc++.tag=https://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen \
-           ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.6.0
+           ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.7.0
 @endcode
 
 Doxygen can now use the information from the tag file to link to the OpenCV
index 0ae71a4448223e993ec2e088471ba2b4b64e4f38..780691e1a3d9175f9e7d390488d736524c47601d 100644 (file)
@@ -6,9 +6,9 @@
 #define OPENCV_VERSION_HPP
 
 #define CV_VERSION_MAJOR    4
-#define CV_VERSION_MINOR    6
+#define CV_VERSION_MINOR    7
 #define CV_VERSION_REVISION 0
-#define CV_VERSION_STATUS   "-dev"
+#define CV_VERSION_STATUS   "-pre"
 
 #define CVAUX_STR_EXP(__A)  #__A
 #define CVAUX_STR(__A)      CVAUX_STR_EXP(__A)
index 630cccf75831b24d03847f875667beaad04cce84..93b5ff315890ab25506432721b026ffa4a2c2091 100644 (file)
@@ -6,7 +6,7 @@
 #define OPENCV_DNN_VERSION_HPP
 
 /// Use with major OpenCV version only.
-#define OPENCV_DNN_API_VERSION 20220524
+#define OPENCV_DNN_API_VERSION 20221220
 
 #if !defined CV_DOXYGEN && !defined CV_STATIC_ANALYSIS && !defined CV_DNN_DONT_ADD_INLINE_NS
 #define CV__DNN_INLINE_NS __CV_CAT(dnn4_v, OPENCV_DNN_API_VERSION)
index 9736e78db891ffadac09570bb6ff1105390ee2f8..13fb4e7b14521b91e78667a7dd6af2d71c969198 100644 (file)
@@ -9,7 +9,7 @@ def main():
     os.chdir(SCRIPT_DIR)
 
     package_name = 'opencv'
-    package_version = os.environ.get('OPENCV_VERSION', '4.6.0')  # TODO
+    package_version = os.environ.get('OPENCV_VERSION', '4.7.0')  # TODO
 
     long_description = 'Open Source Computer Vision Library Python bindings'  # TODO
 
index 1e66e6979abe380733b5220ae0c988c9bb29e32a..f4699df1bf81c1b340485e024e75ccd7109e5eb6 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opencv</groupId>
         <artifactId>opencv-parent</artifactId>
-        <version>4.6.0</version>
+        <version>4.7.0</version>
     </parent>
     <groupId>org.opencv</groupId>
     <artifactId>opencv-it</artifactId>
index c135d4b75f71a5f125632329915c8d6e1aa36f76..bfbf2eef541edc9db17e7e560fa160ade22882a9 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opencv</groupId>
         <artifactId>opencv-parent</artifactId>
-        <version>4.6.0</version>
+        <version>4.7.0</version>
     </parent>
     <groupId>org.opencv</groupId>
     <artifactId>opencv</artifactId>
index de42826a07bc402800ff2b6f0d83efe094d63e82..73d5302c22f5360e026ed1edbac93d051c449fed 100644 (file)
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opencv</groupId>
     <artifactId>opencv-parent</artifactId>
-    <version>4.6.0</version>
+    <version>4.7.0</version>
     <packaging>pom</packaging>
     <name>OpenCV Parent POM</name>
     <licenses>