From 9f04222a75b308b8d9e6865fef8d9efc9be414e0 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Fri, 6 Dec 2013 18:01:15 +0400 Subject: [PATCH] OpenCV Manager version++. --- modules/core/include/opencv2/core/version.hpp | 2 +- .../android/service/engine/AndroidManifest.xml | 4 ++-- platforms/android/service/readme.txt | 28 +++++++++++----------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp index 99241a9..c5a2861 100644 --- a/modules/core/include/opencv2/core/version.hpp +++ b/modules/core/include/opencv2/core/version.hpp @@ -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) diff --git a/platforms/android/service/engine/AndroidManifest.xml b/platforms/android/service/engine/AndroidManifest.xml index 162d31e..7cae6ce 100644 --- a/platforms/android/service/engine/AndroidManifest.xml +++ b/platforms/android/service/engine/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="216@ANDROID_PLATFORM_VERSION_CODE@" + android:versionName="2.16" > diff --git a/platforms/android/service/readme.txt b/platforms/android/service/readme.txt index 1e757a0..a280b50 100644 --- a/platforms/android/service/readme.txt +++ b/platforms/android/service/readme.txt @@ -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_.apk + adb install OpenCV-2.4.7.1-android-sdk/apk/OpenCV_2.4.7.1_Manager_2.15_.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 | ++------------------------------+--------------+------------------------------------------------------+ -- 2.7.4