Merge pull request opencv#23833 from asmorkalov:update_version_4.8.0-pre

pre: OpenCV 4.8.0 (version++)
ywzw2013 · Jun 20, 2023 · 4e31bc5 · 4e31bc5
2 parents 726ba02 + 51702ff
commit 4e31bc5
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown b/doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown
@@ -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.7.0
+TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.8.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.7.0
+           ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.8.0
 @endcode
 
 Doxygen can now use the information from the tag file to link to the OpenCV

diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp
@@ -6,9 +6,9 @@
 #define OPENCV_VERSION_HPP
 
 #define CV_VERSION_MAJOR    4
-#define CV_VERSION_MINOR    7
+#define CV_VERSION_MINOR    8
 #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)

diff --git a/modules/dnn/include/opencv2/dnn/version.hpp b/modules/dnn/include/opencv2/dnn/version.hpp
@@ -6,7 +6,7 @@
 #define OPENCV_DNN_VERSION_HPP
 
 /// Use with major OpenCV version only.
-#define OPENCV_DNN_API_VERSION 20221220
+#define OPENCV_DNN_API_VERSION 20230620
 
 #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)

diff --git a/modules/python/package/setup.py b/modules/python/package/setup.py
@@ -19,7 +19,7 @@ def main():
     os.chdir(SCRIPT_DIR)
 
     package_name = 'opencv'
-    package_version = os.environ.get('OPENCV_VERSION', '4.7.0')  # TODO
+    package_version = os.environ.get('OPENCV_VERSION', '4.8.0')  # TODO
 
     long_description = 'Open Source Computer Vision Library Python bindings'  # TODO
 

diff --git a/platforms/maven/opencv-it/pom.xml b/platforms/maven/opencv-it/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opencv</groupId>
         <artifactId>opencv-parent</artifactId>
-        <version>4.7.0</version>
+        <version>4.8.0</version>
     </parent>
     <groupId>org.opencv</groupId>
     <artifactId>opencv-it</artifactId>

diff --git a/platforms/maven/opencv/pom.xml b/platforms/maven/opencv/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opencv</groupId>
         <artifactId>opencv-parent</artifactId>
-        <version>4.7.0</version>
+        <version>4.8.0</version>
     </parent>
     <groupId>org.opencv</groupId>
     <artifactId>opencv</artifactId>

diff --git a/platforms/maven/pom.xml b/platforms/maven/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opencv</groupId>
     <artifactId>opencv-parent</artifactId>
-    <version>4.7.0</version>
+    <version>4.8.0</version>
     <packaging>pom</packaging>
     <name>OpenCV Parent POM</name>
     <licenses>