Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
3a35ca51
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,发现更多精彩内容 >>
提交
3a35ca51
编写于
6月 09, 2014
作者:
R
Roman Donchenko
提交者:
OpenCV Buildbot
6月 09, 2014
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2831 from alalek:android_examples
上级
e430ab1a
15b6fd2e
变更
12
显示空白变更内容
内联
并排
Showing
12 changed file
with
82 addition
and
9 deletion
+82
-9
CMakeLists.txt
CMakeLists.txt
+1
-0
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVDetectAndroidSDK.cmake
+10
-0
cmake/copyAndroidLibs.cmake
cmake/copyAndroidLibs.cmake
+8
-0
samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java
...zle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java
+7
-1
samples/android/camera-calibration/src/org/opencv/samples/cameracalibration/CameraCalibrationActivity.java
.../samples/cameracalibration/CameraCalibrationActivity.java
+7
-1
samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java
...v/samples/colorblobdetect/ColorBlobDetectionActivity.java
+7
-1
samples/android/face-detection/src/org/opencv/samples/facedetect/FdActivity.java
...tection/src/org/opencv/samples/facedetect/FdActivity.java
+7
-1
samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java
...amples/imagemanipulations/ImageManipulationsActivity.java
+7
-1
samples/android/native-activity/src/org/opencv/samples/NativeActivity/CvNativeActivity.java
...c/org/opencv/samples/NativeActivity/CvNativeActivity.java
+7
-1
samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Tutorial1Activity.java
...w/src/org/opencv/samples/tutorial1/Tutorial1Activity.java
+7
-1
samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Tutorial2Activity.java
...g/src/org/opencv/samples/tutorial2/Tutorial2Activity.java
+7
-1
samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3Activity.java
...l/src/org/opencv/samples/tutorial3/Tutorial3Activity.java
+7
-1
未找到文件。
CMakeLists.txt
浏览文件 @
3a35ca51
...
@@ -216,6 +216,7 @@ OCV_OPTION(ENABLE_NOISY_WARNINGS "Show all warnings even if they are too no
...
@@ -216,6 +216,7 @@ OCV_OPTION(ENABLE_NOISY_WARNINGS "Show all warnings even if they are too no
OCV_OPTION
(
OPENCV_WARNINGS_ARE_ERRORS
"Treat warnings as errors"
OFF
)
OCV_OPTION
(
OPENCV_WARNINGS_ARE_ERRORS
"Treat warnings as errors"
OFF
)
OCV_OPTION
(
ENABLE_WINRT_MODE
"Build with Windows Runtime support"
OFF IF WIN32
)
OCV_OPTION
(
ENABLE_WINRT_MODE
"Build with Windows Runtime support"
OFF IF WIN32
)
OCV_OPTION
(
ENABLE_WINRT_MODE_NATIVE
"Build with Windows Runtime native C++ support"
OFF IF WIN32
)
OCV_OPTION
(
ENABLE_WINRT_MODE_NATIVE
"Build with Windows Runtime native C++ support"
OFF IF WIN32
)
OCV_OPTION
(
ANDROID_EXAMPLES_WITH_LIBS
"Build binaries of Android examples with native libraries"
OFF IF ANDROID
)
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
...
...
cmake/OpenCVDetectAndroidSDK.cmake
浏览文件 @
3a35ca51
...
@@ -335,6 +335,16 @@ macro(add_android_project target path)
...
@@ -335,6 +335,16 @@ macro(add_android_project target path)
add_dependencies
(
${
target
}
${
android_proj_native_deps
}
)
add_dependencies
(
${
target
}
${
android_proj_native_deps
}
)
endif
()
endif
()
if
(
ANDROID_EXAMPLES_WITH_LIBS
)
add_custom_target
(
${
target
}
_copy_libs
COMMAND
${
CMAKE_COMMAND
}
-DSRC_DIR=
${
OpenCV_BINARY_DIR
}
/lib -DDST_DIR=
${
android_proj_bin_dir
}
/libs -P
${
OpenCV_SOURCE_DIR
}
/cmake/copyAndroidLibs.cmake
WORKING_DIRECTORY
${
OpenCV_BINARY_DIR
}
/lib
DEPENDS
"
${
OpenCV_BINARY_DIR
}
/bin/classes.jar.dephelper"
opencv_java
)
add_dependencies
(
${
target
}
${
target
}
_copy_libs
)
endif
()
if
(
__android_project_chain
)
if
(
__android_project_chain
)
add_dependencies
(
${
target
}
${
__android_project_chain
}
)
add_dependencies
(
${
target
}
${
__android_project_chain
}
)
endif
()
endif
()
...
...
cmake/copyAndroidLibs.cmake
0 → 100644
浏览文件 @
3a35ca51
# helper file for Android samples build
file
(
GLOB_RECURSE LIBS RELATIVE
${
SRC_DIR
}
"*.so"
)
foreach
(
l
${
LIBS
}
)
message
(
STATUS
" Copying:
${
l
}
..."
)
execute_process
(
COMMAND
${
CMAKE_COMMAND
}
-E copy_if_different
${
SRC_DIR
}
/
${
l
}
${
DST_DIR
}
/
${
l
}
)
endforeach
()
samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java
浏览文件 @
3a35ca51
...
@@ -76,7 +76,13 @@ public class Puzzle15Activity extends Activity implements CvCameraViewListener,
...
@@ -76,7 +76,13 @@ public class Puzzle15Activity extends Activity implements CvCameraViewListener,
public
void
onResume
()
public
void
onResume
()
{
{
super
.
onResume
();
super
.
onResume
();
if
(!
OpenCVLoader
.
initDebug
())
{
Log
.
d
(
TAG
,
"Internal OpenCV library not found. Using OpenCV Manager for initialization"
);
OpenCVLoader
.
initAsync
(
OpenCVLoader
.
OPENCV_VERSION_2_4_3
,
this
,
mLoaderCallback
);
OpenCVLoader
.
initAsync
(
OpenCVLoader
.
OPENCV_VERSION_2_4_3
,
this
,
mLoaderCallback
);
}
else
{
Log
.
d
(
TAG
,
"OpenCV library found inside package. Using it!"
);
mLoaderCallback
.
onManagerConnected
(
LoaderCallbackInterface
.
SUCCESS
);
}
}
}
public
void
onDestroy
()
{
public
void
onDestroy
()
{
...
...
samples/android/camera-calibration/src/org/opencv/samples/cameracalibration/CameraCalibrationActivity.java
浏览文件 @
3a35ca51
...
@@ -92,7 +92,13 @@ public class CameraCalibrationActivity extends Activity implements CvCameraViewL
...
@@ -92,7 +92,13 @@ public class CameraCalibrationActivity extends Activity implements CvCameraViewL
public
void
onResume
()
public
void
onResume
()
{
{
super
.
onResume
();
super
.
onResume
();
if
(!
OpenCVLoader
.
initDebug
())
{
Log
.
d
(
TAG
,
"Internal OpenCV library not found. Using OpenCV Manager for initialization"
);
OpenCVLoader
.
initAsync
(
OpenCVLoader
.
OPENCV_VERSION_2_4_2
,
this
,
mLoaderCallback
);
OpenCVLoader
.
initAsync
(
OpenCVLoader
.
OPENCV_VERSION_2_4_2
,
this
,
mLoaderCallback
);
}
else
{
Log
.
d
(
TAG
,
"OpenCV library found inside package. Using it!"
);
mLoaderCallback
.
onManagerConnected
(
LoaderCallbackInterface
.
SUCCESS
);
}
}
}
public
void
onDestroy
()
{
public
void
onDestroy
()
{
...
...
samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java
浏览文件 @
3a35ca51
...
@@ -88,7 +88,13 @@ public class ColorBlobDetectionActivity extends Activity implements OnTouchListe
...
@@ -88,7 +88,13 @@ public class ColorBlobDetectionActivity extends Activity implements OnTouchListe
public
void
onResume
()
public
void
onResume
()
{
{
super
.
onResume
();
super
.
onResume
();
if
(!
OpenCVLoader
.
initDebug
())
{
Log
.
d
(
TAG
,
"Internal OpenCV library not found. Using OpenCV Manager for initialization"
);
OpenCVLoader
.
initAsync
(
OpenCVLoader
.
OPENCV_VERSION_2_4_3
,
this
,
mLoaderCallback
);
OpenCVLoader
.
initAsync
(
OpenCVLoader
.
OPENCV_VERSION_2_4_3
,
this
,
mLoaderCallback
);
}
else
{
Log
.
d
(
TAG
,
"OpenCV library found inside package. Using it!"
);
mLoaderCallback
.
onManagerConnected
(
LoaderCallbackInterface
.
SUCCESS
);
}
}
}
public
void
onDestroy
()
{
public
void
onDestroy
()
{
...
...
samples/android/face-detection/src/org/opencv/samples/facedetect/FdActivity.java
浏览文件 @
3a35ca51
...
@@ -139,7 +139,13 @@ public class FdActivity extends Activity implements CvCameraViewListener2 {
...
@@ -139,7 +139,13 @@ public class FdActivity extends Activity implements CvCameraViewListener2 {
public
void
onResume
()
public
void
onResume
()
{
{
super
.
onResume
();
super
.
onResume
();
if
(!
OpenCVLoader
.
initDebug
())
{
Log
.
d
(
TAG
,
"Internal OpenCV library not found. Using OpenCV Manager for initialization"
);
OpenCVLoader
.
initAsync
(
OpenCVLoader
.
OPENCV_VERSION_2_4_3
,
this
,
mLoaderCallback
);
OpenCVLoader
.
initAsync
(
OpenCVLoader
.
OPENCV_VERSION_2_4_3
,
this
,
mLoaderCallback
);
}
else
{
Log
.
d
(
TAG
,
"OpenCV library found inside package. Using it!"
);
mLoaderCallback
.
onManagerConnected
(
LoaderCallbackInterface
.
SUCCESS
);
}
}
}
public
void
onDestroy
()
{
public
void
onDestroy
()
{
...
...
samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java
浏览文件 @
3a35ca51
...
@@ -111,7 +111,13 @@ public class ImageManipulationsActivity extends Activity implements CvCameraView
...
@@ -111,7 +111,13 @@ public class ImageManipulationsActivity extends Activity implements CvCameraView
public
void
onResume
()
public
void
onResume
()
{
{
super
.
onResume
();
super
.
onResume
();
if
(!
OpenCVLoader
.
initDebug
())
{
Log
.
d
(
TAG
,
"Internal OpenCV library not found. Using OpenCV Manager for initialization"
);
OpenCVLoader
.
initAsync
(
OpenCVLoader
.
OPENCV_VERSION_2_4_3
,
this
,
mLoaderCallback
);
OpenCVLoader
.
initAsync
(
OpenCVLoader
.
OPENCV_VERSION_2_4_3
,
this
,
mLoaderCallback
);
}
else
{
Log
.
d
(
TAG
,
"OpenCV library found inside package. Using it!"
);
mLoaderCallback
.
onManagerConnected
(
LoaderCallbackInterface
.
SUCCESS
);
}
}
}
public
void
onDestroy
()
{
public
void
onDestroy
()
{
...
...
samples/android/native-activity/src/org/opencv/samples/NativeActivity/CvNativeActivity.java
浏览文件 @
3a35ca51
...
@@ -39,6 +39,12 @@ public class CvNativeActivity extends Activity {
...
@@ -39,6 +39,12 @@ public class CvNativeActivity extends Activity {
public
void
onResume
()
public
void
onResume
()
{
{
super
.
onResume
();
super
.
onResume
();
if
(!
OpenCVLoader
.
initDebug
())
{
Log
.
d
(
TAG
,
"Internal OpenCV library not found. Using OpenCV Manager for initialization"
);
OpenCVLoader
.
initAsync
(
OpenCVLoader
.
OPENCV_VERSION_2_4_3
,
this
,
mLoaderCallback
);
OpenCVLoader
.
initAsync
(
OpenCVLoader
.
OPENCV_VERSION_2_4_3
,
this
,
mLoaderCallback
);
}
else
{
Log
.
d
(
TAG
,
"OpenCV library found inside package. Using it!"
);
mLoaderCallback
.
onManagerConnected
(
LoaderCallbackInterface
.
SUCCESS
);
}
}
}
}
}
samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Tutorial1Activity.java
浏览文件 @
3a35ca51
...
@@ -76,7 +76,13 @@ public class Tutorial1Activity extends Activity implements CvCameraViewListener2
...
@@ -76,7 +76,13 @@ public class Tutorial1Activity extends Activity implements CvCameraViewListener2
public
void
onResume
()
public
void
onResume
()
{
{
super
.
onResume
();
super
.
onResume
();
if
(!
OpenCVLoader
.
initDebug
())
{
Log
.
d
(
TAG
,
"Internal OpenCV library not found. Using OpenCV Manager for initialization"
);
OpenCVLoader
.
initAsync
(
OpenCVLoader
.
OPENCV_VERSION_2_4_3
,
this
,
mLoaderCallback
);
OpenCVLoader
.
initAsync
(
OpenCVLoader
.
OPENCV_VERSION_2_4_3
,
this
,
mLoaderCallback
);
}
else
{
Log
.
d
(
TAG
,
"OpenCV library found inside package. Using it!"
);
mLoaderCallback
.
onManagerConnected
(
LoaderCallbackInterface
.
SUCCESS
);
}
}
}
public
void
onDestroy
()
{
public
void
onDestroy
()
{
...
...
samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Tutorial2Activity.java
浏览文件 @
3a35ca51
...
@@ -97,7 +97,13 @@ public class Tutorial2Activity extends Activity implements CvCameraViewListener2
...
@@ -97,7 +97,13 @@ public class Tutorial2Activity extends Activity implements CvCameraViewListener2
public
void
onResume
()
public
void
onResume
()
{
{
super
.
onResume
();
super
.
onResume
();
if
(!
OpenCVLoader
.
initDebug
())
{
Log
.
d
(
TAG
,
"Internal OpenCV library not found. Using OpenCV Manager for initialization"
);
OpenCVLoader
.
initAsync
(
OpenCVLoader
.
OPENCV_VERSION_2_4_3
,
this
,
mLoaderCallback
);
OpenCVLoader
.
initAsync
(
OpenCVLoader
.
OPENCV_VERSION_2_4_3
,
this
,
mLoaderCallback
);
}
else
{
Log
.
d
(
TAG
,
"OpenCV library found inside package. Using it!"
);
mLoaderCallback
.
onManagerConnected
(
LoaderCallbackInterface
.
SUCCESS
);
}
}
}
public
void
onDestroy
()
{
public
void
onDestroy
()
{
...
...
samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3Activity.java
浏览文件 @
3a35ca51
...
@@ -88,7 +88,13 @@ public class Tutorial3Activity extends Activity implements CvCameraViewListener2
...
@@ -88,7 +88,13 @@ public class Tutorial3Activity extends Activity implements CvCameraViewListener2
public
void
onResume
()
public
void
onResume
()
{
{
super
.
onResume
();
super
.
onResume
();
if
(!
OpenCVLoader
.
initDebug
())
{
Log
.
d
(
TAG
,
"Internal OpenCV library not found. Using OpenCV Manager for initialization"
);
OpenCVLoader
.
initAsync
(
OpenCVLoader
.
OPENCV_VERSION_2_4_3
,
this
,
mLoaderCallback
);
OpenCVLoader
.
initAsync
(
OpenCVLoader
.
OPENCV_VERSION_2_4_3
,
this
,
mLoaderCallback
);
}
else
{
Log
.
d
(
TAG
,
"OpenCV library found inside package. Using it!"
);
mLoaderCallback
.
onManagerConnected
(
LoaderCallbackInterface
.
SUCCESS
);
}
}
}
public
void
onDestroy
()
{
public
void
onDestroy
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录