Skip to content

Commit 172c539

Browse files
committed
Merge pull request opencv#21281 from alalek:update_version_4.5.5-pre
2 parents 30df77f + 07dca8c commit 172c539

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ Open your Doxyfile using your favorite text editor and search for the key
4646
`TAGFILES`. Change it as follows:
4747

4848
@code
49-
TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.5.4
49+
TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.5.5
5050
@endcode
5151

5252
If you had other definitions already, you can append the line using a `\`:
5353

5454
@code
5555
TAGFILES = ./docs/doxygen-tags/libstdc++.tag=https://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen \
56-
./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.5.4
56+
./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.5.5
5757
@endcode
5858

5959
Doxygen can now use the information from the tag file to link to the OpenCV

modules/core/include/opencv2/core/version.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
#define CV_VERSION_MAJOR 4
99
#define CV_VERSION_MINOR 5
10-
#define CV_VERSION_REVISION 4
11-
#define CV_VERSION_STATUS "-dev"
10+
#define CV_VERSION_REVISION 5
11+
#define CV_VERSION_STATUS "-pre"
1212

1313
#define CVAUX_STR_EXP(__A) #__A
1414
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A)

modules/dnn/include/opencv2/dnn/version.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#define OPENCV_DNN_VERSION_HPP
77

88
/// Use with major OpenCV version only.
9-
#define OPENCV_DNN_API_VERSION 20211004
9+
#define OPENCV_DNN_API_VERSION 20211220
1010

1111
#if !defined CV_DOXYGEN && !defined CV_STATIC_ANALYSIS && !defined CV_DNN_DONT_ADD_INLINE_NS
1212
#define CV__DNN_INLINE_NS __CV_CAT(dnn4_v, OPENCV_DNN_API_VERSION)

modules/python/package/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def main():
99
os.chdir(SCRIPT_DIR)
1010

1111
package_name = 'opencv'
12-
package_version = os.environ.get('OPENCV_VERSION', '4.5.4') # TODO
12+
package_version = os.environ.get('OPENCV_VERSION', '4.5.5') # TODO
1313

1414
long_description = 'Open Source Computer Vision Library Python bindings' # TODO
1515

platforms/maven/opencv-it/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.opencv</groupId>
66
<artifactId>opencv-parent</artifactId>
7-
<version>4.5.4</version>
7+
<version>4.5.5</version>
88
</parent>
99
<groupId>org.opencv</groupId>
1010
<artifactId>opencv-it</artifactId>

platforms/maven/opencv/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.opencv</groupId>
66
<artifactId>opencv-parent</artifactId>
7-
<version>4.5.4</version>
7+
<version>4.5.5</version>
88
</parent>
99
<groupId>org.opencv</groupId>
1010
<artifactId>opencv</artifactId>

platforms/maven/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.opencv</groupId>
55
<artifactId>opencv-parent</artifactId>
6-
<version>4.5.4</version>
6+
<version>4.5.5</version>
77
<packaging>pom</packaging>
88
<name>OpenCV Parent POM</name>
99
<licenses>

0 commit comments

Comments
 (0)