Merge pull request #17501 from alalek:update_version_3.4.11-pre

pull/17503/head^2
Alexander Alekhin 5 years ago
commit 458f1d5ebe
  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. 4
      modules/dnn/include/opencv2/dnn/dnn.hpp
  5. 2
      modules/python/package/setup.py
  6. 2
      platforms/android/build_sdk.py
  7. 2
      platforms/android/service/readme.txt
  8. 2
      platforms/maven/opencv-it/pom.xml
  9. 2
      platforms/maven/opencv/pom.xml
  10. 2
      platforms/maven/pom.xml

@ -15,7 +15,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-3.4.10-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-3.4.11-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`.

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

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

@ -47,9 +47,9 @@
#include "opencv2/core/async.hpp"
#if !defined CV_DOXYGEN && !defined CV_STATIC_ANALYSIS && !defined CV_DNN_DONT_ADD_EXPERIMENTAL_NS
#define CV__DNN_EXPERIMENTAL_NS_BEGIN namespace experimental_dnn_34_v17 {
#define CV__DNN_EXPERIMENTAL_NS_BEGIN namespace experimental_dnn_34_v18 {
#define CV__DNN_EXPERIMENTAL_NS_END }
namespace cv { namespace dnn { namespace experimental_dnn_34_v17 { } using namespace experimental_dnn_34_v17; }}
namespace cv { namespace dnn { namespace experimental_dnn_34_v18 { } using namespace experimental_dnn_34_v18; }}
#else
#define CV__DNN_EXPERIMENTAL_NS_BEGIN
#define CV__DNN_EXPERIMENTAL_NS_END

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

@ -267,7 +267,7 @@ class Builder:
# Add extra data
apkxmldest = check_dir(os.path.join(apkdest, "res", "xml"), create=True)
apklibdest = check_dir(os.path.join(apkdest, "libs", abi.name), create=True)
for ver, d in self.extra_packs + [("3.4.10", os.path.join(self.libdest, "lib"))]:
for ver, d in self.extra_packs + [("3.4.11", os.path.join(self.libdest, "lib"))]:
r = ET.Element("library", attrib={"version": ver})
log.info("Adding libraries from %s", d)

@ -12,7 +12,7 @@ manually using adb tool:
adb install <path-to-OpenCV-sdk>/apk/OpenCV_<version>_Manager_<app_version>_<platform>.apk
Example: OpenCV_3.4.10-dev_Manager_3.49_armeabi-v7a.apk
Example: OpenCV_3.4.11-dev_Manager_3.49_armeabi-v7a.apk
Use the list of platforms below to determine proper OpenCV Manager package for your device:

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

@ -4,7 +4,7 @@
<parent>
<groupId>org.opencv</groupId>
<artifactId>opencv-parent</artifactId>
<version>3.4.10</version>
<version>3.4.11</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>3.4.10</version>
<version>3.4.11</version>
<packaging>pom</packaging>
<name>OpenCV Parent POM</name>
<licenses>

Loading…
Cancel
Save