Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
e241c14b
O
Opencv
项目概览
Greenplum
/
Opencv
大约 1 年 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e241c14b
编写于
6月 26, 2013
作者:
A
Alexander Smorkalov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
OpenCV Library and Manager version incremented.
OpenCV Version 2.4.6; OpenCV Manager Version 2.8; Doc fixes.
上级
bf6b119a
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
30 addition
and
21 deletion
+30
-21
doc/tutorials/introduction/android_binary_package/O4A_SDK.rst
...tutorials/introduction/android_binary_package/O4A_SDK.rst
+7
-7
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
...uction/android_binary_package/dev_with_OCV_on_Android.rst
+9
-9
modules/core/include/opencv2/core/version.hpp
modules/core/include/opencv2/core/version.hpp
+1
-1
modules/java/generator/src/java/android+OpenCVLoader.java
modules/java/generator/src/java/android+OpenCVLoader.java
+5
-0
platforms/android/service/doc/BaseLoaderCallback.rst
platforms/android/service/doc/BaseLoaderCallback.rst
+1
-1
platforms/android/service/doc/JavaHelper.rst
platforms/android/service/doc/JavaHelper.rst
+4
-0
platforms/android/service/engine/AndroidManifest.xml
platforms/android/service/engine/AndroidManifest.xml
+2
-2
platforms/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp
...droid/service/engine/jni/BinderComponent/OpenCVEngine.cpp
+1
-1
未找到文件。
doc/tutorials/introduction/android_binary_package/O4A_SDK.rst
浏览文件 @
e241c14b
...
...
@@ -48,10 +48,10 @@ The structure of package contents looks as follows:
::
OpenCV-2.4.
5
-android-sdk
OpenCV-2.4.
6
-android-sdk
|_ apk
| |_ OpenCV_2.4.
5
_binary_pack_armv7a.apk
| |_ OpenCV_2.4.
5_Manager_2.7
_XXX.apk
| |_ OpenCV_2.4.
6
_binary_pack_armv7a.apk
| |_ OpenCV_2.4.
6_Manager_2.8
_XXX.apk
|
|_ doc
|_ samples
...
...
@@ -157,10 +157,10 @@ Get the OpenCV4Android SDK
.. code-block:: bash
unzip ~/Downloads/OpenCV-2.4.
5
-android-sdk.zip
unzip ~/Downloads/OpenCV-2.4.
6
-android-sdk.zip
.. |opencv_android_bin_pack| replace:: :file:`OpenCV-2.4.
5
-android-sdk.zip`
.. _opencv_android_bin_pack_url: http://sourceforge.net/projects/opencvlibrary/files/opencv-android/2.4.
5/OpenCV-2.4.5
-android-sdk.zip/download
.. |opencv_android_bin_pack| replace:: :file:`OpenCV-2.4.
6
-android-sdk.zip`
.. _opencv_android_bin_pack_url: http://sourceforge.net/projects/opencvlibrary/files/opencv-android/2.4.
6/OpenCV-2.4.6
-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:
<Android SDK path>/platform-tools/adb install <OpenCV4Android SDK path>/apk/OpenCV_2.4.
5_Manager_2.7
_armv7a-neon.apk
<Android SDK path>/platform-tools/adb install <OpenCV4Android SDK path>/apk/OpenCV_2.4.
6_Manager_2.8
_armv7a-neon.apk
.. note:: ``armeabi``, ``armv7a-neon``, ``arm7a-neon-android8``, ``mips`` and ``x86`` stand for
platform targets:
...
...
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
浏览文件 @
e241c14b
...
...
@@ -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.
5
-android-sdk/sdk`).
(:file:`OpenCV-2.4.
6
-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.
5
``.
:guilabel:`Project -> Properties -> Android -> Library -> Add` select ``OpenCV Library - 2.4.
6
``.
.. image:: images/eclipse_opencv_dependency1.png
:alt: Add dependency from OpenCV library
...
...
@@ -101,7 +101,7 @@ See the "15-puzzle" OpenCV sample for details.
public void onResume()
{
super.onResume();
OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_
5
, this, mLoaderCallback);
OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_
6
, this, mLoaderCallback);
}
...
...
...
@@ -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.
5
-android-sdk/sdk`).
(:file:`OpenCV-2.4.
6
-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.
5
``;
:guilabel:`Project -> Properties -> Android -> Library -> Add` select ``OpenCV Library - 2.4.
6
``;
.. 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:`<OpenCV-2.4.
5
-android-sdk>/sdk/native/libs/<target_arch>` to your
native libs from :file:`<OpenCV-2.4.
6
-android-sdk>/sdk/native/libs/<target_arch>` to your
project directory to folder :file:`libs/<target_arch>`.
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.
5
-android-sdk/sdk/native/jni/OpenCV.mk"``
``"include path_to_OpenCV-2.4.
6
-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.
5
-android-sdk\sdk\native\jni\OpenCV.mk
include C:\Work\OpenCV4Android\OpenCV-2.4.
6
-android-sdk\sdk\native\jni\OpenCV.mk
Should be inserted into the :file:`jni/Android.mk` file **after** this line:
...
...
@@ -379,7 +379,7 @@ result.
public void onResume()
{
super.onResume();
OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_
3
, this, mLoaderCallback);
OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_
6
, this, mLoaderCallback);
}
#. Defines that your activity implements ``CvViewFrameListener2`` interface and fix activity related
...
...
modules/core/include/opencv2/core/version.hpp
浏览文件 @
e241c14b
...
...
@@ -49,7 +49,7 @@
#define CV_VERSION_EPOCH 2
#define CV_VERSION_MAJOR 4
#define CV_VERSION_MINOR
5
#define CV_VERSION_MINOR
6
#define CV_VERSION_REVISION 0
#define CVAUX_STR_EXP(__A) #__A
...
...
modules/java/generator/src/java/android+OpenCVLoader.java
浏览文件 @
e241c14b
...
...
@@ -27,6 +27,11 @@ public class OpenCVLoader
*/
public
static
final
String
OPENCV_VERSION_2_4_5
=
"2.4.5"
;
/**
* OpenCV Library version 2.4.6.
*/
public
static
final
String
OPENCV_VERSION_2_4_6
=
"2.4.6"
;
/**
* Loads and initializes OpenCV library from current application package. Roughly, it's an analog of system.loadLibrary("opencv_java").
...
...
platforms/android/service/doc/BaseLoaderCallback.rst
浏览文件 @
e241c14b
...
...
@@ -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_
4
, this, mOpenCVCallBack))
if (!OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_
6
, this, mOpenCVCallBack))
{
Log.e(TAG, "Cannot connect to OpenCV Manager");
}
...
...
platforms/android/service/doc/JavaHelper.rst
浏览文件 @
e241c14b
...
...
@@ -55,3 +55,7 @@ OpenCV version constants
.. data:: OPENCV_VERSION_2_4_5
OpenCV Library version 2.4.5
.. data:: OPENCV_VERSION_2_4_6
OpenCV Library version 2.4.6
platforms/android/service/engine/AndroidManifest.xml
浏览文件 @
e241c14b
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"org.opencv.engine"
android:versionCode=
"2
7
@ANDROID_PLATFORM_VERSION_CODE@"
android:versionName=
"2.
7
"
>
android:versionCode=
"2
8
@ANDROID_PLATFORM_VERSION_CODE@"
android:versionName=
"2.
8
"
>
<uses-sdk
android:minSdkVersion=
"@ANDROID_NATIVE_API_LEVEL@"
/>
<uses-feature
android:name=
"android.hardware.touchscreen"
android:required=
"false"
/>
...
...
platforms/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp
浏览文件 @
e241c14b
...
...
@@ -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
};
const
int
OpenCVEngine
::
KnownVersions
[]
=
{
2040000
,
2040100
,
2040200
,
2040300
,
2040301
,
2040302
,
2040400
,
2040500
,
2040600
};
bool
OpenCVEngine
::
ValidateVersion
(
int
version
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录