mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 09:25:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #21281 from alalek:update_version_4.5.5-pre

Browse Source
This commit is contained in:
Alexander Alekhin 2021-12-18 13:46:38 +00:00
commit 172c539a5a
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown
View 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.5.4
TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.5.5
@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.5.4
./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.5.5
@endcode
Doxygen can now use the information from the tag file to link to the OpenCV

4
modules/core/include/opencv2/core/version.hpp
View File

@ -7,8 +7,8 @@
#define CV_VERSION_MAJOR 4
#define CV_VERSION_MINOR 5
#define CV_VERSION_REVISION 4
#define CV_VERSION_STATUS "-dev"
#define CV_VERSION_REVISION 5
#define CV_VERSION_STATUS "-pre"
#define CVAUX_STR_EXP(__A) #__A
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A)

2
modules/dnn/include/opencv2/dnn/version.hpp
View File

@ -6,7 +6,7 @@
#define OPENCV_DNN_VERSION_HPP
/// Use with major OpenCV version only.
#define OPENCV_DNN_API_VERSION 20211004
#define OPENCV_DNN_API_VERSION 20211220
#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)

2
modules/python/package/setup.py
View File

@ -9,7 +9,7 @@ def main():
os.chdir(SCRIPT_DIR)
package_name = 'opencv'
package_version = os.environ.get('OPENCV_VERSION', '4.5.4') # TODO
package_version = os.environ.get('OPENCV_VERSION', '4.5.5') # TODO
long_description = 'Open Source Computer Vision Library Python bindings' # TODO

2
platforms/maven/opencv-it/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.opencv</groupId>
<artifactId>opencv-parent</artifactId>
<version>4.5.4</version>
<version>4.5.5</version>
</parent>
<groupId>org.opencv</groupId>
<artifactId>opencv-it</artifactId>

2
platforms/maven/opencv/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.opencv</groupId>
<artifactId>opencv-parent</artifactId>
<version>4.5.4</version>
<version>4.5.5</version>
</parent>
<groupId>org.opencv</groupId>
<artifactId>opencv</artifactId>

2
platforms/maven/pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.opencv</groupId>
<artifactId>opencv-parent</artifactId>
<version>4.5.4</version>
<version>4.5.5</version>
<packaging>pom</packaging>
<name>OpenCV Parent POM</name>
<licenses>