From 9f39c8eaa194e59fb47c623a9c27cc51a0072896 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Thu, 21 Feb 2013 14:42:28 +0400 Subject: [PATCH] OpenCV 2.4.4 preparation Manager verison incremented; Additional constatnt for library intialization added; Documents updated. --- android/service/doc/BaseLoaderCallback.rst | 2 +- android/service/doc/JavaHelper.rst | 4 +++ android/service/engine/AndroidManifest.xml | 4 +-- android/service/readme.txt | 28 +++++++++---------- .../src/java/android+OpenCVLoader.java | 5 ++++ 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/android/service/doc/BaseLoaderCallback.rst b/android/service/doc/BaseLoaderCallback.rst index 3258004c5..71915c449 100644 --- a/android/service/doc/BaseLoaderCallback.rst +++ b/android/service/doc/BaseLoaderCallback.rst @@ -48,7 +48,7 @@ See the "15-puzzle" OpenCV sample for details. super.onResume(); Log.i(TAG, "Trying to load OpenCV library"); - if (!OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, this, mOpenCVCallBack)) + if (!OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_4, this, mOpenCVCallBack)) { Log.e(TAG, "Cannot connect to OpenCV Manager"); } diff --git a/android/service/doc/JavaHelper.rst b/android/service/doc/JavaHelper.rst index 9a128db0a..34798c267 100644 --- a/android/service/doc/JavaHelper.rst +++ b/android/service/doc/JavaHelper.rst @@ -47,3 +47,7 @@ OpenCV version constants .. data:: OPENCV_VERSION_2_4_3 OpenCV Library version 2.4.3 + +.. data:: OPENCV_VERSION_2_4_4 + + OpenCV Library version 2.4.4 diff --git a/android/service/engine/AndroidManifest.xml b/android/service/engine/AndroidManifest.xml index 4af965202..f4f0eb94f 100644 --- a/android/service/engine/AndroidManifest.xml +++ b/android/service/engine/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="26@ANDROID_PLATFORM_VERSION_CODE@" + android:versionName="2.6" > diff --git a/android/service/readme.txt b/android/service/readme.txt index 7da05853a..df17c1824 100644 --- a/android/service/readme.txt +++ b/android/service/readme.txt @@ -14,20 +14,20 @@ manually using adb tool: .. code-block:: sh - adb install OpenCV-2.4.3-android-sdk/apk/OpenCV_2.4.3.2_Manager_2.4_.apk + adb install OpenCV-2.4.4-android-sdk/apk/OpenCV_2.4.4_Manager_2.6_.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.3.2_Manager_2.4_armv7a-neon.apk | -+------------------------------+--------------+-----------------------------------------------------+ -| armeabi-v7a (ARMv7-A + NEON) | = 2.2 | OpenCV_2.4.3.2_Manager_2.4_armv7a-neon-android8.apk | -+------------------------------+--------------+-----------------------------------------------------+ -| armeabi (ARMv5, ARMv6) | >= 2.3 | OpenCV_2.4.3.2_Manager_2.4_armeabi.apk | -+------------------------------+--------------+-----------------------------------------------------+ -| Intel x86 | >= 2.3 | OpenCV_2.4.3.2_Manager_2.4_x86.apk | -+------------------------------+--------------+-----------------------------------------------------+ -| MIPS | >= 2.3 | OpenCV_2.4.3.2_Manager_2.4_mips.apk | -+------------------------------+--------------+-----------------------------------------------------+ ++------------------------------+--------------+---------------------------------------------------+ +| Hardware Platform | Android ver. | Package name | ++==============================+==============+===================================================+ +| armeabi-v7a (ARMv7-A + NEON) | >= 2.3 | OpenCV_2.4.4_Manager_2.6_armv7a-neon.apk | ++------------------------------+--------------+---------------------------------------------------+ +| armeabi-v7a (ARMv7-A + NEON) | = 2.2 | OpenCV_2.4.4_Manager_2.6_armv7a-neon-android8.apk | ++------------------------------+--------------+---------------------------------------------------+ +| armeabi (ARMv5, ARMv6) | >= 2.3 | OpenCV_2.4.4_Manager_2.6_armeabi.apk | ++------------------------------+--------------+---------------------------------------------------+ +| Intel x86 | >= 2.3 | OpenCV_2.4.4_Manager_2.6_x86.apk | ++------------------------------+--------------+---------------------------------------------------+ +| MIPS | >= 2.3 | OpenCV_2.4.4_Manager_2.6_mips.apk | ++------------------------------+--------------+---------------------------------------------------+ diff --git a/modules/java/generator/src/java/android+OpenCVLoader.java b/modules/java/generator/src/java/android+OpenCVLoader.java index 4c3655c12..70e94944d 100644 --- a/modules/java/generator/src/java/android+OpenCVLoader.java +++ b/modules/java/generator/src/java/android+OpenCVLoader.java @@ -17,6 +17,11 @@ public class OpenCVLoader */ public static final String OPENCV_VERSION_2_4_3 = "2.4.3"; + /** + * OpenCV Library version 2.4.4. + */ + public static final String OPENCV_VERSION_2_4_4 = "2.4.4"; + /** * 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.