Merge tag '3.3.1'

doc/tutorials/dnn/dnn_android/dnn_android.markdown

@@ -6,13 +6,13 @@ using OpenCV deep learning module.
 
 Tutorial was written for the following versions of corresponding software:
 - Android Studio 2.3.3
-- OpenCV 3.3.0
+- OpenCV 3.3.0+
 
 ## Requirements
 
 - 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. At this moment it's an `opencv-3.3.0-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.3.0-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`.
 

doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown

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

modules/core/include/opencv2/core/version.hpp

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

modules/dnn/include/opencv2/dnn/dnn.hpp

@@ -46,9 +46,9 @@
 #include <opencv2/core.hpp>
 
 #if !defined CV_DOXYGEN && !defined CV_DNN_DONT_ADD_EXPERIMENTAL_NS
-#define CV__DNN_EXPERIMENTAL_NS_BEGIN namespace experimental_dnn_v1 {
+#define CV__DNN_EXPERIMENTAL_NS_BEGIN namespace experimental_dnn_v2 {
 #define CV__DNN_EXPERIMENTAL_NS_END }
-namespace cv { namespace dnn { namespace experimental_dnn_v1 { } using namespace experimental_dnn_v1; }}
+namespace cv { namespace dnn { namespace experimental_dnn_v2 { } using namespace experimental_dnn_v2; }}
 #else
 #define CV__DNN_EXPERIMENTAL_NS_BEGIN
 #define CV__DNN_EXPERIMENTAL_NS_END

platforms/android/build_sdk.py

@@ -171,7 +171,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.3.0", os.path.join(self.libdest, "lib"))]:
+        for ver, d in self.extra_packs + [("3.3.1", os.path.join(self.libdest, "lib"))]:
             r = ET.Element("library", attrib={"version": ver})
             log.info("Adding libraries from %s", d)
 

platforms/android/service/engine/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.opencv.engine"
-    android:versionCode="330@ANDROID_PLATFORM_ID@"
+    android:versionCode="331@ANDROID_PLATFORM_ID@"
-    android:versionName="3.30">
+    android:versionName="3.31">
 
     <uses-sdk android:minSdkVersion="@ANDROID_NATIVE_API_LEVEL@" android:targetSdkVersion="22"/>
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>

platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java

@@ -134,7 +134,7 @@ public class OpenCVEngineService extends Service {
 
             @Override
             public int getEngineVersion() throws RemoteException {
-                int version = 3300;
+                int version = 3310;
                 try {
                     version = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
                 } catch (NameNotFoundException e) {

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.3.0-dev_Manager_3.30_armeabi-v7a.apk
+Example: OpenCV_3.3.1-dev_Manager_3.30_armeabi-v7a.apk
 
 Use the list of platforms below to determine proper OpenCV Manager package for your device:
 

platforms/maven/opencv-it/pom.xml

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

platforms/maven/opencv/pom.xml

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

platforms/maven/pom.xml

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