Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
87c27a07
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
87c27a07
编写于
8月 04, 2017
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge tag '3.3.0'
OpenCV 3.3.0
上级
953160dd
4af3ca4e
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
6 addition
and
6 deletion
+6
-6
modules/core/include/opencv2/core/version.hpp
modules/core/include/opencv2/core/version.hpp
+1
-1
platforms/android/build_sdk.py
platforms/android/build_sdk.py
+1
-1
platforms/android/service/engine/AndroidManifest.xml
platforms/android/service/engine/AndroidManifest.xml
+2
-2
platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java
...ice/engine/src/org/opencv/engine/OpenCVEngineService.java
+1
-1
platforms/android/service/readme.txt
platforms/android/service/readme.txt
+1
-1
未找到文件。
modules/core/include/opencv2/core/version.hpp
浏览文件 @
87c27a07
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
#define CV_VERSION_MAJOR 3
#define CV_VERSION_MAJOR 3
#define CV_VERSION_MINOR 3
#define CV_VERSION_MINOR 3
#define CV_VERSION_REVISION 0
#define CV_VERSION_REVISION 0
#define CV_VERSION_STATUS "-
rc
"
#define CV_VERSION_STATUS "-
dev
"
#define CVAUX_STR_EXP(__A) #__A
#define CVAUX_STR_EXP(__A) #__A
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A)
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A)
...
...
platforms/android/build_sdk.py
浏览文件 @
87c27a07
...
@@ -171,7 +171,7 @@ class Builder:
...
@@ -171,7 +171,7 @@ class Builder:
# Add extra data
# Add extra data
apkxmldest
=
check_dir
(
os
.
path
.
join
(
apkdest
,
"res"
,
"xml"
),
create
=
True
)
apkxmldest
=
check_dir
(
os
.
path
.
join
(
apkdest
,
"res"
,
"xml"
),
create
=
True
)
apklibdest
=
check_dir
(
os
.
path
.
join
(
apkdest
,
"libs"
,
abi
.
name
),
create
=
True
)
apklibdest
=
check_dir
(
os
.
path
.
join
(
apkdest
,
"libs"
,
abi
.
name
),
create
=
True
)
for
ver
,
d
in
self
.
extra_packs
+
[(
"3.
2
.0"
,
os
.
path
.
join
(
self
.
libdest
,
"lib"
))]:
for
ver
,
d
in
self
.
extra_packs
+
[(
"3.
3
.0"
,
os
.
path
.
join
(
self
.
libdest
,
"lib"
))]:
r
=
ET
.
Element
(
"library"
,
attrib
=
{
"version"
:
ver
})
r
=
ET
.
Element
(
"library"
,
attrib
=
{
"version"
:
ver
})
log
.
info
(
"Adding libraries from %s"
,
d
)
log
.
info
(
"Adding libraries from %s"
,
d
)
...
...
platforms/android/service/engine/AndroidManifest.xml
浏览文件 @
87c27a07
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"org.opencv.engine"
package=
"org.opencv.engine"
android:versionCode=
"3
2
0@ANDROID_PLATFORM_ID@"
android:versionCode=
"3
3
0@ANDROID_PLATFORM_ID@"
android:versionName=
"3.
2
0"
>
android:versionName=
"3.
3
0"
>
<uses-sdk
android:minSdkVersion=
"@ANDROID_NATIVE_API_LEVEL@"
android:targetSdkVersion=
"22"
/>
<uses-sdk
android:minSdkVersion=
"@ANDROID_NATIVE_API_LEVEL@"
android:targetSdkVersion=
"22"
/>
<uses-feature
android:name=
"android.hardware.touchscreen"
android:required=
"false"
/>
<uses-feature
android:name=
"android.hardware.touchscreen"
android:required=
"false"
/>
...
...
platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java
浏览文件 @
87c27a07
...
@@ -134,7 +134,7 @@ public class OpenCVEngineService extends Service {
...
@@ -134,7 +134,7 @@ public class OpenCVEngineService extends Service {
@Override
@Override
public
int
getEngineVersion
()
throws
RemoteException
{
public
int
getEngineVersion
()
throws
RemoteException
{
int
version
=
3
2
00
;
int
version
=
3
3
00
;
try
{
try
{
version
=
getPackageManager
().
getPackageInfo
(
getPackageName
(),
0
).
versionCode
;
version
=
getPackageManager
().
getPackageInfo
(
getPackageName
(),
0
).
versionCode
;
}
catch
(
NameNotFoundException
e
)
{
}
catch
(
NameNotFoundException
e
)
{
...
...
platforms/android/service/readme.txt
浏览文件 @
87c27a07
...
@@ -12,7 +12,7 @@ manually using adb tool:
...
@@ -12,7 +12,7 @@ manually using adb tool:
adb install <path-to-OpenCV-sdk>/apk/OpenCV_<version>_Manager_<app_version>_<platform>.apk
adb install <path-to-OpenCV-sdk>/apk/OpenCV_<version>_Manager_<app_version>_<platform>.apk
Example: OpenCV_3.
2.0-dev_Manager_3.2
0_armeabi-v7a.apk
Example: OpenCV_3.
3.0-dev_Manager_3.3
0_armeabi-v7a.apk
Use the list of platforms below to determine proper OpenCV Manager package for your device:
Use the list of platforms below to determine proper OpenCV Manager package for your device:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录