mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 03:00:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16078 from alalek:update_version_4.2.0-pre

Browse Source
This commit is contained in:
Alexander Alekhin 2019-12-06 11:26:11 +00:00
commit 774d28efb1
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/tutorials/dnn/dnn_android/dnn_android.markdown
View File

@ -12,7 +12,7 @@ Tutorial was written for the following versions of corresponding software:
- Download and install Android Studio from https://developer.android.com/studio.
- Get the latest pre-built OpenCV for Android release from https://github.com/opencv/opencv/releases and unpack it (for example, `opencv-4.1.2-android-sdk.zip`).
- Get the latest pre-built OpenCV for Android release from https://github.com/opencv/opencv/releases and unpack it (for example, `opencv-4.2.0-android-sdk.zip`).
- Download MobileNet object detection model from https://github.com/chuanqi305/MobileNet-SSD. We need a configuration file `MobileNetSSD_deploy.prototxt` and weights `MobileNetSSD_deploy.caffemodel`.

4
doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown
View File

@ -36,14 +36,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.1.2
TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.2.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.1.2
./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.2.0
@endcode
Doxygen can now use the information from the tag file to link to the OpenCV

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

@ -6,9 +6,9 @@
#define OPENCV_VERSION_HPP
#define CV_VERSION_MAJOR 4
#define CV_VERSION_MINOR 1
#define CV_VERSION_REVISION 2
#define CV_VERSION_STATUS "-dev"
#define CV_VERSION_MINOR 2
#define CV_VERSION_REVISION 0
#define CV_VERSION_STATUS "-pre"
#define CVAUX_STR_EXP(__A) #__A
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A)

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.1.2') # TODO
package_version = os.environ.get('OPENCV_VERSION', '4.2.0') # 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.1.2</version>
<version>4.2.0</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.1.2</version>
<version>4.2.0</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.1.2</version>
<version>4.2.0</version>
<packaging>pom</packaging>
<name>OpenCV Parent POM</name>
<licenses>