Merge tag '4.0.1'

OpenCV 4.0.1
pull/13512/head
Alexander Alekhin 6 years ago
commit e1f5b886fb
  1. 4
      doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown
  2. 2
      modules/core/include/opencv2/core/version.hpp
  3. 2
      modules/python/package/setup.py
  4. 2
      platforms/maven/opencv-it/pom.xml
  5. 2
      platforms/maven/opencv/pom.xml
  6. 2
      platforms/maven/pom.xml

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

@ -7,7 +7,7 @@
#define CV_VERSION_MAJOR 4
#define CV_VERSION_MINOR 0
#define CV_VERSION_REVISION 0
#define CV_VERSION_REVISION 1
#define CV_VERSION_STATUS "-dev"
#define CVAUX_STR_EXP(__A) #__A

@ -9,7 +9,7 @@ def main():
os.chdir(SCRIPT_DIR)
package_name = 'opencv'
package_version = os.environ.get('OPENCV_VERSION', '4.0.0') # TODO
package_version = os.environ.get('OPENCV_VERSION', '4.0.1') # 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.0.0</version>
<version>4.0.1</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.0.0</version>
<version>4.0.1</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.0.0</version>
<version>4.0.1</version>
<packaging>pom</packaging>
<name>OpenCV Parent POM</name>
<licenses>

Loading…
Cancel
Save