From 4ec193094905a903f5a80e2f5c51688304c1a1c9 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Mon, 23 Dec 2013 11:31:41 +0400 Subject: [PATCH] OpenCV version++; OpenCV Manager version++. --- .../android_binary_package/O4A_SDK.rst | 14 +++++----- .../dev_with_OCV_on_Android.rst | 14 +++++----- modules/core/include/opencv2/core/version.hpp | 4 +-- .../src/java/android+OpenCVLoader.java | 4 +++ platforms/android/service/doc/JavaHelper.rst | 4 +++ .../jni/BinderComponent/OpenCVEngine.cpp | 2 +- platforms/android/service/readme.txt | 28 +++++++++---------- 7 files changed, 39 insertions(+), 31 deletions(-) diff --git a/doc/tutorials/introduction/android_binary_package/O4A_SDK.rst b/doc/tutorials/introduction/android_binary_package/O4A_SDK.rst index 27dd81581..9a683ea49 100644 --- a/doc/tutorials/introduction/android_binary_package/O4A_SDK.rst +++ b/doc/tutorials/introduction/android_binary_package/O4A_SDK.rst @@ -48,10 +48,10 @@ The structure of package contents looks as follows: :: - OpenCV-2.4.7-android-sdk + OpenCV-2.4.8-android-sdk |_ apk - | |_ OpenCV_2.4.7_binary_pack_armv7a.apk - | |_ OpenCV_2.4.7_Manager_2.14_XXX.apk + | |_ OpenCV_2.4.8_binary_pack_armv7a.apk + | |_ OpenCV_2.4.8_Manager_2.16_XXX.apk | |_ doc |_ samples @@ -157,10 +157,10 @@ Get the OpenCV4Android SDK .. code-block:: bash - unzip ~/Downloads/OpenCV-2.4.7-android-sdk.zip + unzip ~/Downloads/OpenCV-2.4.8-android-sdk.zip -.. |opencv_android_bin_pack| replace:: :file:`OpenCV-2.4.7-android-sdk.zip` -.. _opencv_android_bin_pack_url: http://sourceforge.net/projects/opencvlibrary/files/opencv-android/2.4.7/OpenCV-2.4.7-android-sdk.zip/download +.. |opencv_android_bin_pack| replace:: :file:`OpenCV-2.4.8-android-sdk.zip` +.. _opencv_android_bin_pack_url: http://sourceforge.net/projects/opencvlibrary/files/opencv-android/2.4.8/OpenCV-2.4.8-android-sdk.zip/download .. |opencv_android_bin_pack_url| replace:: |opencv_android_bin_pack| .. |seven_zip| replace:: 7-Zip .. _seven_zip: http://www.7-zip.org/ @@ -295,7 +295,7 @@ Well, running samples from Eclipse is very simple: .. code-block:: sh :linenos: - /platform-tools/adb install /apk/OpenCV_2.4.7_Manager_2.14_armv7a-neon.apk + /platform-tools/adb install /apk/OpenCV_2.4.8_Manager_2.16_armv7a-neon.apk .. note:: ``armeabi``, ``armv7a-neon``, ``arm7a-neon-android8``, ``mips`` and ``x86`` stand for platform targets: diff --git a/doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst b/doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst index 12b602ceb..3d7268c80 100644 --- a/doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst +++ b/doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst @@ -55,14 +55,14 @@ Manager to access OpenCV libraries externally installed in the target system. :guilabel:`File -> Import -> Existing project in your workspace`. Press :guilabel:`Browse` button and locate OpenCV4Android SDK - (:file:`OpenCV-2.4.7-android-sdk/sdk`). + (:file:`OpenCV-2.4.8-android-sdk/sdk`). .. image:: images/eclipse_opencv_dependency0.png :alt: Add dependency from OpenCV library :align: center #. In application project add a reference to the OpenCV Java SDK in - :guilabel:`Project -> Properties -> Android -> Library -> Add` select ``OpenCV Library - 2.4.7``. + :guilabel:`Project -> Properties -> Android -> Library -> Add` select ``OpenCV Library - 2.4.8``. .. image:: images/eclipse_opencv_dependency1.png :alt: Add dependency from OpenCV library @@ -128,27 +128,27 @@ described above. #. Add the OpenCV library project to your workspace the same way as for the async initialization above. Use menu :guilabel:`File -> Import -> Existing project in your workspace`, press :guilabel:`Browse` button and select OpenCV SDK path - (:file:`OpenCV-2.4.7-android-sdk/sdk`). + (:file:`OpenCV-2.4.8-android-sdk/sdk`). .. image:: images/eclipse_opencv_dependency0.png :alt: Add dependency from OpenCV library :align: center #. In the application project add a reference to the OpenCV4Android SDK in - :guilabel:`Project -> Properties -> Android -> Library -> Add` select ``OpenCV Library - 2.4.7``; + :guilabel:`Project -> Properties -> Android -> Library -> Add` select ``OpenCV Library - 2.4.8``; .. image:: images/eclipse_opencv_dependency1.png :alt: Add dependency from OpenCV library :align: center #. If your application project **doesn't have a JNI part**, just copy the corresponding OpenCV - native libs from :file:`/sdk/native/libs/` to your + native libs from :file:`/sdk/native/libs/` to your project directory to folder :file:`libs/`. In case of the application project **with a JNI part**, instead of manual libraries copying you need to modify your ``Android.mk`` file: add the following two code lines after the ``"include $(CLEAR_VARS)"`` and before - ``"include path_to_OpenCV-2.4.7-android-sdk/sdk/native/jni/OpenCV.mk"`` + ``"include path_to_OpenCV-2.4.8-android-sdk/sdk/native/jni/OpenCV.mk"`` .. code-block:: make :linenos: @@ -221,7 +221,7 @@ taken: .. code-block:: make - include C:\Work\OpenCV4Android\OpenCV-2.4.7-android-sdk\sdk\native\jni\OpenCV.mk + include C:\Work\OpenCV4Android\OpenCV-2.4.8-android-sdk\sdk\native\jni\OpenCV.mk Should be inserted into the :file:`jni/Android.mk` file **after** this line: diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp index c5a28612d..25e5892b6 100644 --- a/modules/core/include/opencv2/core/version.hpp +++ b/modules/core/include/opencv2/core/version.hpp @@ -49,8 +49,8 @@ #define CV_VERSION_EPOCH 2 #define CV_VERSION_MAJOR 4 -#define CV_VERSION_MINOR 7 -#define CV_VERSION_REVISION 2 +#define CV_VERSION_MINOR 8 +#define CV_VERSION_REVISION 0 #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 index a130ae30f..46e62eb34 100644 --- a/modules/java/generator/src/java/android+OpenCVLoader.java +++ b/modules/java/generator/src/java/android+OpenCVLoader.java @@ -37,6 +37,10 @@ public class OpenCVLoader */ public static final String OPENCV_VERSION_2_4_7 = "2.4.7"; + /** + * OpenCV Library version 2.4.8. + */ + public static final String OPENCV_VERSION_2_4_8 = "2.4.8"; /** * Loads and initializes OpenCV library from current application package. Roughly, it's an analog of system.loadLibrary("opencv_java"). diff --git a/platforms/android/service/doc/JavaHelper.rst b/platforms/android/service/doc/JavaHelper.rst index 5c1e1c325..05576a1b2 100644 --- a/platforms/android/service/doc/JavaHelper.rst +++ b/platforms/android/service/doc/JavaHelper.rst @@ -63,3 +63,7 @@ OpenCV version constants .. data:: OPENCV_VERSION_2_4_7 OpenCV Library version 2.4.7 + +.. data:: OPENCV_VERSION_2_4_8 + + OpenCV Library version 2.4.8 diff --git a/platforms/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp b/platforms/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp index dbd192b79..359906406 100644 --- a/platforms/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp +++ b/platforms/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp @@ -15,7 +15,7 @@ using namespace android; const int OpenCVEngine::Platform = DetectKnownPlatforms(); const int OpenCVEngine::CpuID = GetCpuID(); -const int OpenCVEngine::KnownVersions[] = {2040000, 2040100, 2040200, 2040300, 2040301, 2040302, 2040400, 2040500, 2040600, 2040700}; +const int OpenCVEngine::KnownVersions[] = {2040000, 2040100, 2040200, 2040300, 2040301, 2040302, 2040400, 2040500, 2040600, 2040700, 2040701, 2040800}; bool OpenCVEngine::ValidateVersion(int version) { diff --git a/platforms/android/service/readme.txt b/platforms/android/service/readme.txt index a280b506f..65678093d 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.1-android-sdk/apk/OpenCV_2.4.7.1_Manager_2.15_.apk + adb install OpenCV-2.4.8-android-sdk/apk/OpenCV_2.4.8_Manager_2.16_.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.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 | -+------------------------------+--------------+------------------------------------------------------+ ++------------------------------+--------------+----------------------------------------------------+ +| Hardware Platform | Android ver. | Package name | ++==============================+==============+====================================================+ +| armeabi-v7a (ARMv7-A + NEON) | >= 2.3 | OpenCV_2.4.8_Manager_2.16_armv7a-neon.apk | ++------------------------------+--------------+----------------------------------------------------+ +| armeabi-v7a (ARMv7-A + NEON) | = 2.2 | OpenCV_2.4.8_Manager_2.16_armv7a-neon-android8.apk | ++------------------------------+--------------+----------------------------------------------------+ +| armeabi (ARMv5, ARMv6) | >= 2.3 | OpenCV_2.4.8_Manager_2.16_armeabi.apk | ++------------------------------+--------------+----------------------------------------------------+ +| Intel x86 | >= 2.3 | OpenCV_2.4.8_Manager_2.16_x86.apk | ++------------------------------+--------------+----------------------------------------------------+ +| MIPS | >= 2.3 | OpenCV_2.4.8_Manager_2.16_mips.apk | ++------------------------------+--------------+----------------------------------------------------+