Merge pull request opencv#7885 from alalek:release-3.2.0-rc

Swift-Yah · Dec 19, 2016 · a4db983 · a4db983
2 parents ece0837 + d85c11e
commit a4db983
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 16 deletions.
diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp
@@ -51,9 +51,9 @@
 #define OPENCV_VERSION_HPP
 
 #define CV_VERSION_MAJOR 3
-#define CV_VERSION_MINOR 1
+#define CV_VERSION_MINOR 2
 #define CV_VERSION_REVISION 0
-#define CV_VERSION_STATUS "-dev"
+#define CV_VERSION_STATUS "-rc"
 
 #define CVAUX_STR_EXP(__A) #__A
 #define CVAUX_STR(__A) CVAUX_STR_EXP(__A)

diff --git a/modules/java/generator/src/java/android+OpenCVLoader.java b/modules/java/generator/src/java/android+OpenCVLoader.java
@@ -57,6 +57,16 @@ 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";
+
+ /**
+ * OpenCV Library version 2.4.13.
+ */
+ public static final String OPENCV_VERSION_2_4_13 = "2.4.13";
+
  /**
  * OpenCV Library version 3.0.0.
  */
@@ -67,6 +77,10 @@ public class OpenCVLoader
  */
  public static final String OPENCV_VERSION_3_1_0 = "3.1.0";
 
+ /**
+ * OpenCV Library version 3.2.0.
+ */
+ public static final String OPENCV_VERSION_3_2_0 = "3.2.0";
 
  /**
  * Loads and initializes OpenCV library from current application package. Roughly, it's an analog of system.loadLibrary("opencv_java").

diff --git a/platforms/android/build_sdk.py b/platforms/android/build_sdk.py
@@ -171,7 +171,7 @@ def build_engine(self, abi, engdest):
  # 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.1.0", os.path.join(self.libdest, "lib"))]:
+ for ver, d in self.extra_packs + [("3.2.0", 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/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="310@ANDROID_PLATFORM_ID@"
- android:versionName="3.10">
+ android:versionCode="320@ANDROID_PLATFORM_ID@"
+ android:versionName="3.20">
 
  <uses-sdk android:minSdkVersion="@ANDROID_NATIVE_API_LEVEL@" android:targetSdkVersion="22"/>
  <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>

diff --git a/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java b/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java
@@ -134,7 +134,7 @@ public String getLibPathByVersion(String version)
 
  @Override
  public int getEngineVersion() throws RemoteException {
- int version = 3100;
+ int version = 3200;
  try {
  version = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
  } catch (NameNotFoundException e) {

diff --git a/platforms/android/service/readme.txt b/platforms/android/service/readme.txt
@@ -10,14 +10,16 @@ from Google Play.
 If Google Play is not available (i.e. on emulator, developer board, etc), you can install it
 manually using adb tool:
 
- adb install <path-to-OpenCV-sdk>/apk/OpenCV_3.1.0_Manager_3.10_<platform>.apk
+ adb install <path-to-OpenCV-sdk>/apk/OpenCV_<version>_Manager_<app_version>_<platform>.apk
 
-Use the list below to determine proper OpenCV Manager package for your device:
+Example: OpenCV_3.2.0-dev_Manager_3.20_armeabi-v7a.apk
 
-- OpenCV_3.1.0-dev_Manager_3.10_armeabi.apk - armeabi (ARMv5, ARMv6)
-- OpenCV_3.1.0-dev_Manager_3.10_armeabi-v7a.apk - armeabi-v7a (ARMv7-A + NEON)
-- OpenCV_3.1.0-dev_Manager_3.10_arm64-v8a.apk - arm64-v8a (ARM64-v8a)
-- OpenCV_3.1.0-dev_Manager_3.10_mips.apk - mips (MIPS)
-- OpenCV_3.1.0-dev_Manager_3.10_mips64.apk - mips64 (MIPS64)
-- OpenCV_3.1.0-dev_Manager_3.10_x86.apk - x86
-- OpenCV_3.1.0-dev_Manager_3.10_x86_64.apk - x86_64
+Use the list of platforms below to determine proper OpenCV Manager package for your device:
+
+- armeabi (ARMv5, ARMv6)
+- armeabi-v7a (ARMv7-A + NEON)
+- arm64-v8a
+- mips
+- mips64
+- x86
+- x86_64
diff --git a/platforms/maven/pom.xml b/platforms/maven/pom.xml
@@ -4,7 +4,7 @@
  <groupId>opencv.org</groupId>
  <artifactId>opencv</artifactId>
  <packaging>bundle</packaging>
- <version>3.1.0</version>
+ <version>3.2.0</version>
  <name>OpenCV</name>
  <licenses>
  <license>