Merge pull request #5092 from etalanin:update-branch-to-2-4-12

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

@@ -49,7 +49,7 @@
 
 #define CV_VERSION_EPOCH    2
 #define CV_VERSION_MAJOR    4
-#define CV_VERSION_MINOR    11
+#define CV_VERSION_MINOR    12
 #define CV_VERSION_REVISION 0
 
 #define CVAUX_STR_EXP(__A)  #__A

modules/java/generator/src/java/android+OpenCVLoader.java

@@ -57,6 +57,11 @@ public class OpenCVLoader
      */
     public static final String OPENCV_VERSION_2_4_11 = "2.4.11";
 
+    /**
+     * OpenCV Library version 2.4.12.
+     */
+    public static final String OPENCV_VERSION_2_4_12 = "2.4.12";
+
     /**
      * Loads and initializes OpenCV library from current application package. Roughly, it's an analog of system.loadLibrary("opencv_java").
      * @return Returns true is initialization of OpenCV was successful.

platforms/android/service/engine/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.opencv.engine"
-    android:versionCode="219@ANDROID_PLATFORM_VERSION_CODE@"
-    android:versionName="2.20" >
+    android:versionCode="221@ANDROID_PLATFORM_VERSION_CODE@"
+    android:versionName="2.21" >
 
     <uses-sdk android:minSdkVersion="@ANDROID_NATIVE_API_LEVEL@" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
@@ -27,4 +27,4 @@
         </intent-filter>
     </activity>
     </application>
-</manifest>
\ No newline at end of file
+</manifest>

platforms/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp

@@ -15,7 +15,7 @@ using namespace android;
 
 const int OpenCVEngine::Platform = DetectKnownPlatforms();
 const int OpenCVEngine::CpuID = GetCpuID();
-const int OpenCVEngine::KnownVersions[] = {2040000, 2040100, 2040200, 2040300, 2040301, 2040302, 2040400, 2040500, 2040600, 2040700, 2040701, 2040800, 2040900, 2041000, 2041100};
+const int OpenCVEngine::KnownVersions[] = {2040000, 2040100, 2040200, 2040300, 2040301, 2040302, 2040400, 2040500, 2040600, 2040700, 2040701, 2040800, 2040900, 2041000, 2041100, 2041200};
 
 bool OpenCVEngine::ValidateVersion(int version)
 {