Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
71914987
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,发现更多精彩内容 >>
提交
71914987
编写于
12月 27, 2013
作者:
R
Roman Donchenko
提交者:
OpenCV Buildbot
12月 27, 2013
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2074 from asmorkalov:android_nonfree_cuda
上级
ee36717d
c48777a1
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
16 addition
and
9 deletion
+16
-9
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVGenAndroidMK.cmake
+3
-1
modules/nonfree/CMakeLists.txt
modules/nonfree/CMakeLists.txt
+6
-1
modules/nonfree/include/opencv2/nonfree/gpu.hpp
modules/nonfree/include/opencv2/nonfree/gpu.hpp
+1
-1
modules/nonfree/src/cuda/surf.cu
modules/nonfree/src/cuda/surf.cu
+1
-1
modules/nonfree/src/precomp.hpp
modules/nonfree/src/precomp.hpp
+1
-1
modules/nonfree/src/surf_gpu.cpp
modules/nonfree/src/surf_gpu.cpp
+2
-2
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
...s/stitching/include/opencv2/stitching/detail/matchers.hpp
+2
-2
未找到文件。
cmake/OpenCVGenAndroidMK.cmake
浏览文件 @
71914987
...
...
@@ -70,7 +70,9 @@ if(ANDROID)
endif
()
# GPU module enabled separately
list
(
REMOVE_ITEM OPENCV_MODULES_CONFIGMAKE
"gpu"
)
list
(
REMOVE_ITEM OPENCV_MODULES_CONFIGMAKE
"opencv_gpu"
)
list
(
REMOVE_ITEM OPENCV_MODULES_CONFIGMAKE
"opencv_dynamicuda"
)
if
(
HAVE_opencv_gpu
)
set
(
OPENCV_HAVE_GPU_MODULE_CONFIGMAKE
"on"
)
endif
()
...
...
modules/nonfree/CMakeLists.txt
浏览文件 @
71914987
...
...
@@ -4,4 +4,9 @@ endif()
set
(
the_description
"Functionality with possible limitations on the use"
)
ocv_warnings_disable
(
CMAKE_CXX_FLAGS -Wundef
)
ocv_define_module
(
nonfree opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_gpu opencv_ocl
)
if
(
ENABLE_DYNAMIC_CUDA
)
set
(
HAVE_CUDA FALSE
)
ocv_define_module
(
nonfree opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_ocl
)
else
()
ocv_define_module
(
nonfree opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_gpu opencv_ocl
)
endif
()
\ No newline at end of file
modules/nonfree/include/opencv2/nonfree/gpu.hpp
浏览文件 @
71914987
...
...
@@ -45,7 +45,7 @@
#include "opencv2/opencv_modules.hpp"
#if defined(HAVE_OPENCV_GPU)
#if defined(HAVE_OPENCV_GPU)
&& !defined(ANDROID)
#include "opencv2/gpu/gpu.hpp"
...
...
modules/nonfree/src/cuda/surf.cu
浏览文件 @
71914987
...
...
@@ -42,7 +42,7 @@
#include "opencv2/opencv_modules.hpp"
#if
def HAVE_OPENCV_GPU
#if
defined(HAVE_OPENCV_GPU) && !defined(ANDROID)
#include "opencv2/gpu/device/common.hpp"
#include "opencv2/gpu/device/limits.hpp"
...
...
modules/nonfree/src/precomp.hpp
浏览文件 @
71914987
...
...
@@ -51,7 +51,7 @@
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/core/internal.hpp"
#if defined(HAVE_OPENCV_GPU)
#if defined(HAVE_OPENCV_GPU)
&& !defined(ANDROID)
#include "opencv2/nonfree/gpu.hpp"
#if defined(HAVE_CUDA)
...
...
modules/nonfree/src/surf_gpu.cpp
浏览文件 @
71914987
...
...
@@ -42,7 +42,7 @@
#include "precomp.hpp"
#if defined(HAVE_OPENCV_GPU)
#if defined(HAVE_OPENCV_GPU)
&& !defined(ANDROID)
using
namespace
cv
;
using
namespace
cv
::
gpu
;
...
...
@@ -422,4 +422,4 @@ void cv::gpu::SURF_GPU::releaseMemory()
#endif // !defined (HAVE_CUDA)
#endif // defined(HAVE_OPENCV_GPU)
#endif // defined(HAVE_OPENCV_GPU)
&& !defined(ANDROID)
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
浏览文件 @
71914987
...
...
@@ -48,7 +48,7 @@
#include "opencv2/opencv_modules.hpp"
#if defined(HAVE_OPENCV_NONFREE) && defined(HAVE_OPENCV_GPU)
#if defined(HAVE_OPENCV_NONFREE) && defined(HAVE_OPENCV_GPU)
&& !defined(ANDROID)
#include "opencv2/nonfree/gpu.hpp"
#endif
...
...
@@ -104,7 +104,7 @@ private:
};
#if defined(HAVE_OPENCV_NONFREE) && defined(HAVE_OPENCV_GPU)
#if defined(HAVE_OPENCV_NONFREE) && defined(HAVE_OPENCV_GPU)
&& !defined(ANDROID)
class
CV_EXPORTS
SurfFeaturesFinderGpu
:
public
FeaturesFinder
{
public:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录