Thanks to visit codestin.com
Credit goes to github.com

Skip to content

pre: OpenCV 5.0.0-alpha (version++). #26540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 28, 2024
Merged

pre: OpenCV 5.0.0-alpha (version++). #26540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/5.0.0
TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/5.0.0-alpha
@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/5.0.0
./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/5.0.0-alpha
@endcode

Doxygen can now use the information from the tag file to link to the OpenCV
Expand Down
2 changes: 1 addition & 1 deletion modules/core/include/opencv2/core/version.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#define CV_VERSION_MAJOR 5
#define CV_VERSION_MINOR 0
#define CV_VERSION_REVISION 0
#define CV_VERSION_STATUS "-pre"
#define CV_VERSION_STATUS "alpha-pre"

#define CVAUX_STR_EXP(__A) #__A
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A)
Expand Down
2 changes: 1 addition & 1 deletion modules/dnn/include/opencv2/dnn/version.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define OPENCV_DNN_VERSION_HPP

/// Use with major OpenCV version only.
#define OPENCV_DNN_API_VERSION 20240521
#define OPENCV_DNN_API_VERSION 20241127

#if !defined CV_DOXYGEN && !defined CV_STATIC_ANALYSIS && !defined CV_DNN_DONT_ADD_INLINE_NS
#define CV__DNN_INLINE_NS __CV_CAT(dnn5_v, OPENCV_DNN_API_VERSION)
Expand Down
2 changes: 1 addition & 1 deletion modules/python/package/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def main():
os.chdir(SCRIPT_DIR)

package_name = 'opencv'
package_version = os.environ.get('OPENCV_VERSION', '5.0.0') # TODO
package_version = os.environ.get('OPENCV_VERSION', '5.0.0-alpha') # TODO

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

Expand Down
2 changes: 1 addition & 1 deletion platforms/maven/opencv-it/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opencv</groupId>
<artifactId>opencv-parent</artifactId>
<version>5.0.0</version>
<version>5.0.0-alpha</version>
</parent>
<groupId>org.opencv</groupId>
<artifactId>opencv-it</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion platforms/maven/opencv/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opencv</groupId>
<artifactId>opencv-parent</artifactId>
<version>5.0.0</version>
<version>5.0.0-alpha</version>
</parent>
<groupId>org.opencv</groupId>
<artifactId>opencv</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion platforms/maven/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.opencv</groupId>
<artifactId>opencv-parent</artifactId>
<version>5.0.0</version>
<version>5.0.0-alpha</version>
<packaging>pom</packaging>
<name>OpenCV Parent POM</name>
<licenses>
Expand Down