Merge pull request #15436 from alalek:update_version_4.1.2-pre

pull/15451/head
Alexander Alekhin 5 years ago
commit e736f590f7
  1. 2
      doc/tutorials/dnn/dnn_android/dnn_android.markdown
  2. 4
      doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown
  3. 4
      modules/core/include/opencv2/core/version.hpp
  4. 2
      modules/dnn/include/opencv2/dnn/version.hpp
  5. 2
      modules/python/package/setup.py
  6. 2
      platforms/maven/opencv-it/pom.xml
  7. 2
      platforms/maven/opencv/pom.xml
  8. 2
      platforms/maven/pom.xml

@ -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.1-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.1.2-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`.

@ -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.1
TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.1.2
@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.1
./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.1.2
@endcode
Doxygen can now use the information from the tag file to link to the OpenCV

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

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

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

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

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

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

Loading…
Cancel
Save