diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp index c48a40356f..b22b027829 100644 --- a/modules/core/include/opencv2/core/version.hpp +++ b/modules/core/include/opencv2/core/version.hpp @@ -53,7 +53,7 @@ #define CV_VERSION_MAJOR 3 #define CV_VERSION_MINOR 3 #define CV_VERSION_REVISION 0 -#define CV_VERSION_STATUS "-rc" +#define CV_VERSION_STATUS "" #define CVAUX_STR_EXP(__A) #__A #define CVAUX_STR(__A) CVAUX_STR_EXP(__A) diff --git a/platforms/android/build_sdk.py b/platforms/android/build_sdk.py index e78e3b92fb..a96ee845e5 100755 --- a/platforms/android/build_sdk.py +++ b/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.2.0", os.path.join(self.libdest, "lib"))]: + for ver, d in self.extra_packs + [("3.3.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 index 6c90858d6d..7a52ecc977 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="320@ANDROID_PLATFORM_ID@" - android:versionName="3.20"> + android:versionCode="330@ANDROID_PLATFORM_ID@" + android:versionName="3.30"> <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 index c604fa9003..5283cc2bc9 100644 --- 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 class OpenCVEngineService extends Service { @Override public int getEngineVersion() throws RemoteException { - int version = 3200; + int version = 3300; try { version = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode; } catch (NameNotFoundException e) { diff --git a/platforms/android/service/readme.txt b/platforms/android/service/readme.txt index f7e886afc3..88ee35e2b9 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.2.0-dev_Manager_3.20_armeabi-v7a.apk +Example: OpenCV_3.3.0-dev_Manager_3.30_armeabi-v7a.apk Use the list of platforms below to determine proper OpenCV Manager package for your device: