From a123c48d4d6aaff36fe41e398fbbfcf328a678a4 Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Date: Mon, 1 Mar 2021 21:38:18 +0000
Subject: [PATCH] pre: OpenCV 3.4.14 (version++)
---
.../cross_referencing/tutorial_cross_referencing.markdown | 4 ++--
modules/core/include/opencv2/core/version.hpp | 4 ++--
modules/dnn/include/opencv2/dnn/dnn.hpp | 4 ++--
modules/python/package/setup.py | 2 +-
platforms/android/build_sdk.py | 2 +-
platforms/android/service/readme.txt | 2 +-
platforms/maven/opencv-it/pom.xml | 2 +-
platforms/maven/opencv/pom.xml | 2 +-
platforms/maven/pom.xml | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown b/doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown
index f99387eb84..65159659f1 100644
--- 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.13
+TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.14
@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.13
+ ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.14
@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 980396a036..0697c68ec9 100644
--- 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 13
-#define CV_VERSION_STATUS "-dev"
+#define CV_VERSION_REVISION 14
+#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 b2dd0e6e16..f4efe57fac 100644
--- 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_v20 {
+#define CV__DNN_EXPERIMENTAL_NS_BEGIN namespace experimental_dnn_34_v21 {
#define CV__DNN_EXPERIMENTAL_NS_END }
-namespace cv { namespace dnn { namespace experimental_dnn_34_v20 { } using namespace experimental_dnn_34_v20; }}
+namespace cv { namespace dnn { namespace experimental_dnn_34_v21 { } using namespace experimental_dnn_34_v21; }}
#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 c598382dfb..d0262cbb50 100644
--- 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.13') # TODO
+ package_version = os.environ.get('OPENCV_VERSION', '3.4.14') # 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 a0054eaf5e..763aac9ebe 100755
--- 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.13", os.path.join(self.libdest, "lib"))]:
+ for ver, d in self.extra_packs + [("3.4.14", 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 769864b5ab..c0b4f6df12 100644
--- 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.13-dev_Manager_3.49_armeabi-v7a.apk
+Example: OpenCV_3.4.14-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 c043363773..dca1af9e46 100644
--- 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.13</version>
+ <version>3.4.14</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 705a4da98a..368a9a3518 100644
--- 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.13</version>
+ <version>3.4.14</version>
</parent>
<groupId>org.opencv</groupId>
<artifactId>opencv</artifactId>
diff --git a/platforms/maven/pom.xml b/platforms/maven/pom.xml
index 771635ecb6..31ceab6fb1 100644
--- 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.13</version>
+ <version>3.4.14</version>
<packaging>pom</packaging>
<name>OpenCV Parent POM</name>
<licenses>