pre: OpenCV 3.4.15 (version++)

diff --git a/doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown b/doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown
index 65159659f1ad87a251cabd91b7b81a5393b631ae..ac347cbca975ee1d50e513cab317fec3b6ed2ba7 100644 (file)
--- a/doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown
+++ b/doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown
@@ -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.14
+TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.15
 @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.14
+           ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.15
 @endcode
 
 Doxygen can now use the information from the tag file to link to the OpenCV

diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp
index e10108b4d82bade94e953ebd272589017f829a9f..a71c13ebd1c4346eae39d63f0eba2af04f5dcaa1 100644 (file)
--- a/modules/core/include/opencv2/core/version.hpp
+++ b/modules/core/include/opencv2/core/version.hpp
@@ -7,8 +7,8 @@
 
 #define CV_VERSION_MAJOR    3
 #define CV_VERSION_MINOR    4
-#define CV_VERSION_REVISION 14
-#define CV_VERSION_STATUS   "-dev"
+#define CV_VERSION_REVISION 15
+#define CV_VERSION_STATUS   "-pre"
 
 #define CVAUX_STR_EXP(__A)  #__A
 #define CVAUX_STR(__A)      CVAUX_STR_EXP(__A)

diff --git a/modules/dnn/include/opencv2/dnn/dnn.hpp b/modules/dnn/include/opencv2/dnn/dnn.hpp
index e31e89bde529100bb600067c1a46fad9f6b17094..524dc587e6c32a22c0a66bea2cf26e8c4075422d 100644 (file)
--- a/modules/dnn/include/opencv2/dnn/dnn.hpp
+++ b/modules/dnn/include/opencv2/dnn/dnn.hpp
@@ -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_v21 {
+#define CV__DNN_EXPERIMENTAL_NS_BEGIN namespace experimental_dnn_34_v22 {
 #define CV__DNN_EXPERIMENTAL_NS_END }
-namespace cv { namespace dnn { namespace experimental_dnn_34_v21 { } using namespace experimental_dnn_34_v21; }}
+namespace cv { namespace dnn { namespace experimental_dnn_34_v22 { } using namespace experimental_dnn_34_v22; }}
 #else
 #define CV__DNN_EXPERIMENTAL_NS_BEGIN
 #define CV__DNN_EXPERIMENTAL_NS_END

diff --git a/modules/python/package/setup.py b/modules/python/package/setup.py
index d0262cbb50c1a154a86b6b7f603f34a244cd6378..7c015770e6c79411a6d7515370bcc761b0c63054 100644 (file)
--- a/modules/python/package/setup.py
+++ b/modules/python/package/setup.py
@@ -9,7 +9,7 @@ def main():
     os.chdir(SCRIPT_DIR)
 
     package_name = 'opencv'
-    package_version = os.environ.get('OPENCV_VERSION', '3.4.14')  # TODO
+    package_version = os.environ.get('OPENCV_VERSION', '3.4.15')  # TODO
 
     long_description = 'Open Source Computer Vision Library Python bindings'  # TODO
 

diff --git a/platforms/android/build_sdk.py b/platforms/android/build_sdk.py
index 763aac9ebe5b175c9445ca48495a66ef4f824570..cbde665611a4c3c2797e17eced4001a7adace789 100755 (executable)
--- a/platforms/android/build_sdk.py
+++ b/platforms/android/build_sdk.py
@@ -269,7 +269,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.14", os.path.join(self.libdest, "lib"))]:
+        for ver, d in self.extra_packs + [("3.4.15", os.path.join(self.libdest, "lib"))]:
             r = ET.Element("library", attrib={"version": ver})
             log.info("Adding libraries from %s", d)
 

diff --git a/platforms/android/service/readme.txt b/platforms/android/service/readme.txt
index c0b4f6df12f82ed64eb792fc1b24627a9c4f9965..a10138c1a6b79c771b5adbf1efaac69b2c84f1a6 100644 (file)
--- a/platforms/android/service/readme.txt
+++ b/platforms/android/service/readme.txt
@@ -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.14-dev_Manager_3.49_armeabi-v7a.apk
+Example: OpenCV_3.4.15-dev_Manager_3.49_armeabi-v7a.apk
 
 Use the list of platforms below to determine proper OpenCV Manager package for your device:
 

diff --git a/platforms/maven/opencv-it/pom.xml b/platforms/maven/opencv-it/pom.xml
index dca1af9e46d84c8c04c19eda2dae845db94692bb..bef5fe28aa5d42d3d9c4782e58c3bdd333cb338e 100644 (file)
--- a/platforms/maven/opencv-it/pom.xml
+++ b/platforms/maven/opencv-it/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opencv</groupId>
         <artifactId>opencv-parent</artifactId>
-        <version>3.4.14</version>
+        <version>3.4.15</version>
     </parent>
     <groupId>org.opencv</groupId>
     <artifactId>opencv-it</artifactId>

diff --git a/platforms/maven/opencv/pom.xml b/platforms/maven/opencv/pom.xml
index 368a9a35185d6581f0e7b17f1ea56841e8dc346c..6b11c7a0faceb36d459f14a17821f48f96f0b6c0 100644 (file)
--- a/platforms/maven/opencv/pom.xml
+++ b/platforms/maven/opencv/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opencv</groupId>
         <artifactId>opencv-parent</artifactId>
-        <version>3.4.14</version>
+        <version>3.4.15</version>
     </parent>
     <groupId>org.opencv</groupId>
     <artifactId>opencv</artifactId>

diff --git a/platforms/maven/pom.xml b/platforms/maven/pom.xml
index 31ceab6fb16b5d7d9c88f70211018237d52c28f8..69e57724895f82a5a8e289a8ec72defa13440ae3 100644 (file)
--- a/platforms/maven/pom.xml
+++ b/platforms/maven/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opencv</groupId>
     <artifactId>opencv-parent</artifactId>
-    <version>3.4.14</version>
+    <version>3.4.15</version>
     <packaging>pom</packaging>
     <name>OpenCV Parent POM</name>
     <licenses>