OpenCV Manager version++.
authorAlexander Smorkalov <alexander.smorkalov@itseez.com>
Fri, 6 Dec 2013 14:01:15 +0000 (18:01 +0400)
committerAlexander Smorkalov <alexander.smorkalov@itseez.com>
Fri, 6 Dec 2013 14:53:03 +0000 (18:53 +0400)
modules/core/include/opencv2/core/version.hpp
platforms/android/service/engine/AndroidManifest.xml
platforms/android/service/readme.txt

index 99241a9..c5a2861 100644 (file)
@@ -50,7 +50,7 @@
 #define CV_VERSION_EPOCH    2
 #define CV_VERSION_MAJOR    4
 #define CV_VERSION_MINOR    7
-#define CV_VERSION_REVISION 0
+#define CV_VERSION_REVISION 2
 
 #define CVAUX_STR_EXP(__A)  #__A
 #define CVAUX_STR(__A)      CVAUX_STR_EXP(__A)
index 162d31e..7cae6ce 100644 (file)
@@ -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="214@ANDROID_PLATFORM_VERSION_CODE@"
-    android:versionName="2.14" >
+    android:versionCode="216@ANDROID_PLATFORM_VERSION_CODE@"
+    android:versionName="2.16" >
 
     <uses-sdk android:minSdkVersion="@ANDROID_NATIVE_API_LEVEL@" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
index 1e757a0..a280b50 100644 (file)
@@ -14,20 +14,20 @@ manually using adb tool:
 
 .. code-block:: sh
 
-    adb install OpenCV-2.4.7-android-sdk/apk/OpenCV_2.4.7_Manager_2.14_<platform>.apk
+    adb install OpenCV-2.4.7.1-android-sdk/apk/OpenCV_2.4.7.1_Manager_2.15_<platform>.apk
 
 Use the table below to determine proper OpenCV Manager package for your device:
 
-+------------------------------+--------------+----------------------------------------------------+
-| Hardware Platform            | Android ver. | Package name                                       |
-+==============================+==============+====================================================+
-| armeabi-v7a (ARMv7-A + NEON) |    >= 2.3    | OpenCV_2.4.7_Manager_2.14_armv7a-neon.apk          |
-+------------------------------+--------------+----------------------------------------------------+
-| armeabi-v7a (ARMv7-A + NEON) |     = 2.2    | OpenCV_2.4.7_Manager_2.14_armv7a-neon-android8.apk |
-+------------------------------+--------------+----------------------------------------------------+
-| armeabi (ARMv5, ARMv6)       |    >= 2.3    | OpenCV_2.4.7_Manager_2.14_armeabi.apk              |
-+------------------------------+--------------+----------------------------------------------------+
-| Intel x86                    |    >= 2.3    | OpenCV_2.4.7_Manager_2.14_x86.apk                  |
-+------------------------------+--------------+----------------------------------------------------+
-| MIPS                         |    >= 2.3    | OpenCV_2.4.7_Manager_2.14_mips.apk                 |
-+------------------------------+--------------+----------------------------------------------------+
++------------------------------+--------------+------------------------------------------------------+
+| Hardware Platform            | Android ver. | Package name                                         |
++==============================+==============+======================================================+
+| armeabi-v7a (ARMv7-A + NEON) |    >= 2.3    | OpenCV_2.4.7.1_Manager_2.15_armv7a-neon.apk          |
++------------------------------+--------------+------------------------------------------------------+
+| armeabi-v7a (ARMv7-A + NEON) |     = 2.2    | OpenCV_2.4.7.1_Manager_2.15_armv7a-neon-android8.apk |
++------------------------------+--------------+------------------------------------------------------+
+| armeabi (ARMv5, ARMv6)       |    >= 2.3    | OpenCV_2.4.7.1_Manager_2.15_armeabi.apk              |
++------------------------------+--------------+------------------------------------------------------+
+| Intel x86                    |    >= 2.3    | OpenCV_2.4.7.1_Manager_2.15_x86.apk                  |
++------------------------------+--------------+------------------------------------------------------+
+| MIPS                         |    >= 2.3    | OpenCV_2.4.7.1_Manager_2.15_mips.apk                 |
++------------------------------+--------------+------------------------------------------------------+