From ac6ca660f4daf62b5b1d388e806b0f7d73c552e5 Mon Sep 17 00:00:00 2001
From: Evgeny Talanin <evgeny.talanin@itseez.com>
Date: Wed, 29 Jul 2015 20:34:47 +0300
Subject: [PATCH 1/2] Increase version to 2.4.12
---
modules/core/include/opencv2/core/version.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp
index 1430a7d0cf..50562ec5ad 100644
--- a/modules/core/include/opencv2/core/version.hpp
+++ b/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
From 9a3dccab20356576a12969479dfb91bdb00ffd70 Mon Sep 17 00:00:00 2001
From: Evgeny Talanin <evgeny.talanin@itseez.com>
Date: Wed, 29 Jul 2015 21:16:21 +0300
Subject: [PATCH 2/2] Increase Android Manager version
---
modules/java/generator/src/java/android+OpenCVLoader.java | 5 +++++
platforms/android/service/engine/AndroidManifest.xml | 6 +++---
.../service/engine/jni/BinderComponent/OpenCVEngine.cpp | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/modules/java/generator/src/java/android+OpenCVLoader.java b/modules/java/generator/src/java/android+OpenCVLoader.java
index 9d704086e2..2c05272c22 100644
--- a/modules/java/generator/src/java/android+OpenCVLoader.java
+++ b/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.
diff --git a/platforms/android/service/engine/AndroidManifest.xml b/platforms/android/service/engine/AndroidManifest.xml
index 49ece296d3..92855b3ef3 100644
--- a/platforms/android/service/engine/AndroidManifest.xml
+++ b/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="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>
diff --git a/platforms/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp b/platforms/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp
index 3103059d17..842497ff1b 100644
--- a/platforms/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp
+++ b/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)
{