Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
b5d073ad
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,发现更多精彩内容 >>
提交
b5d073ad
编写于
8月 26, 2014
作者:
V
Vadim Pisarevsky
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3149 from StevenPuttemans:fix_nonfree_includes
上级
71891123
564a8ed2
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
31 addition
and
31 deletion
+31
-31
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
...s/stitching/include/opencv2/stitching/detail/matchers.hpp
+3
-3
modules/stitching/src/matchers.cpp
modules/stitching/src/matchers.cpp
+4
-4
modules/stitching/src/precomp.hpp
modules/stitching/src/precomp.hpp
+2
-2
modules/stitching/src/stitcher.cpp
modules/stitching/src/stitcher.cpp
+2
-2
modules/stitching/test/test_matchers.cpp
modules/stitching/test/test_matchers.cpp
+1
-1
modules/world/src/precomp.hpp
modules/world/src/precomp.hpp
+2
-2
modules/world/src/world_init.cpp
modules/world/src/world_init.cpp
+2
-2
samples/cpp/stitching_detailed.cpp
samples/cpp/stitching_detailed.cpp
+1
-1
samples/gpu/CMakeLists.txt
samples/gpu/CMakeLists.txt
+4
-4
samples/gpu/performance/CMakeLists.txt
samples/gpu/performance/CMakeLists.txt
+4
-4
samples/gpu/performance/tests.cpp
samples/gpu/performance/tests.cpp
+4
-4
samples/gpu/surf_keypoint_matcher.cpp
samples/gpu/surf_keypoint_matcher.cpp
+2
-2
未找到文件。
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
浏览文件 @
b5d073ad
...
...
@@ -48,8 +48,8 @@
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_
NONFREE
# include "opencv2/
nonfree
/cuda.hpp"
#ifdef HAVE_OPENCV_
XFEATURES2D
# include "opencv2/
xfeatures2d
/cuda.hpp"
#endif
namespace
cv
{
...
...
@@ -104,7 +104,7 @@ private:
};
#ifdef HAVE_OPENCV_
NONFREE
#ifdef HAVE_OPENCV_
XFEATURES2D
class
CV_EXPORTS
SurfFeaturesFinderGpu
:
public
FeaturesFinder
{
public:
...
...
modules/stitching/src/matchers.cpp
浏览文件 @
b5d073ad
...
...
@@ -46,10 +46,10 @@ using namespace cv;
using
namespace
cv
::
detail
;
using
namespace
cv
::
cuda
;
#ifdef HAVE_OPENCV_
NONFREE
#include "opencv2/
nonfree
.hpp"
#ifdef HAVE_OPENCV_
XFEATURES2D
#include "opencv2/
xfeatures2d
.hpp"
static
bool
makeUseOfNonfree
=
initModule_
nonfree
();
static
bool
makeUseOfNonfree
=
initModule_
xfeatures2d
();
#endif
namespace
{
...
...
@@ -443,7 +443,7 @@ void OrbFeaturesFinder::find(InputArray image, ImageFeatures &features)
}
}
#ifdef HAVE_OPENCV_
NONFREE
#ifdef HAVE_OPENCV_
XFEATURES2D
SurfFeaturesFinderGpu
::
SurfFeaturesFinderGpu
(
double
hess_thresh
,
int
num_octaves
,
int
num_layers
,
int
num_octaves_descr
,
int
num_layers_descr
)
{
...
...
modules/stitching/src/precomp.hpp
浏览文件 @
b5d073ad
...
...
@@ -87,8 +87,8 @@
# include "opencv2/cuda.hpp"
#endif
#ifdef HAVE_OPENCV_
NONFREE
# include "opencv2/
nonfree
/cuda.hpp"
#ifdef HAVE_OPENCV_
XFEATURES2D
# include "opencv2/
xfeatures2d
/cuda.hpp"
#endif
#include "../../imgproc/src/gcgraph.hpp"
...
...
modules/stitching/src/stitcher.cpp
浏览文件 @
b5d073ad
...
...
@@ -59,7 +59,7 @@ Stitcher Stitcher::createDefault(bool try_use_gpu)
#ifdef HAVE_OPENCV_CUDA
if
(
try_use_gpu
&&
cuda
::
getCudaEnabledDeviceCount
()
>
0
)
{
#ifdef HAVE_OPENCV_
NONFREE
#ifdef HAVE_OPENCV_
XFEATURES2D
stitcher
.
setFeaturesFinder
(
makePtr
<
detail
::
SurfFeaturesFinderGpu
>
());
#else
stitcher
.
setFeaturesFinder
(
makePtr
<
detail
::
OrbFeaturesFinder
>
());
...
...
@@ -70,7 +70,7 @@ Stitcher Stitcher::createDefault(bool try_use_gpu)
else
#endif
{
#ifdef HAVE_OPENCV_
NONFREE
#ifdef HAVE_OPENCV_
XFEATURES2D
stitcher
.
setFeaturesFinder
(
makePtr
<
detail
::
SurfFeaturesFinder
>
());
#else
stitcher
.
setFeaturesFinder
(
makePtr
<
detail
::
OrbFeaturesFinder
>
());
...
...
modules/stitching/test/test_matchers.cpp
浏览文件 @
b5d073ad
...
...
@@ -42,7 +42,7 @@
#include "test_precomp.hpp"
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_
NONFREE
#ifdef HAVE_OPENCV_
XFEATURES2D
using
namespace
cv
;
using
namespace
std
;
...
...
modules/world/src/precomp.hpp
浏览文件 @
b5d073ad
...
...
@@ -53,8 +53,8 @@
#ifdef HAVE_OPENCV_FEATURES2D
#include "opencv2/features2d.hpp"
#endif
#ifdef HAVE_OPENCV_
NONFREE
#include "opencv2/nonfree.hpp"
#ifdef HAVE_OPENCV_
XFEATURES2D
#include "opencv2/
xfeatures2d/
nonfree.hpp"
#endif
#include "opencv2/world.hpp"
...
...
modules/world/src/world_init.cpp
浏览文件 @
b5d073ad
...
...
@@ -51,8 +51,8 @@ bool cv::initAll()
#ifdef HAVE_OPENCV_FEATURES2D
&&
initModule_features2d
()
#endif
#ifdef HAVE_OPENCV_
NONFREE
&&
initModule_
nonfree
()
#ifdef HAVE_OPENCV_
XFEATURES2D
&&
initModule_
xfeatures2d
()
#endif
;
}
samples/cpp/stitching_detailed.cpp
浏览文件 @
b5d073ad
...
...
@@ -384,7 +384,7 @@ int main(int argc, char* argv[])
Ptr
<
FeaturesFinder
>
finder
;
if
(
features_type
==
"surf"
)
{
#ifdef HAVE_OPENCV_
NONFREE
#ifdef HAVE_OPENCV_
XFEATURES2D
if
(
try_cuda
&&
cuda
::
getCudaEnabledDeviceCount
()
>
0
)
finder
=
makePtr
<
SurfFeaturesFinderGpu
>
();
else
...
...
samples/gpu/CMakeLists.txt
浏览文件 @
b5d073ad
...
...
@@ -19,8 +19,8 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
"
${
OpenCV_SOURCE_DIR
}
/modules/gpu/src/nvidia/core"
)
if
(
HAVE_opencv_
nonfree
)
ocv_include_directories
(
"
${
OpenCV_SOURCE_DIR
}
/modules/
nonfree
/include"
)
if
(
HAVE_opencv_
xfeatures2d
)
ocv_include_directories
(
"
${
OpenCV_SOURCE_DIR
}
/modules/
xfeatures2d
/include"
)
endif
()
if
(
HAVE_opencv_cudacodec
)
...
...
@@ -52,8 +52,8 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
ocv_target_link_libraries
(
${
the_target
}
${
CUDA_CUDA_LIBRARY
}
)
endif
()
if
(
HAVE_opencv_
nonfree
)
ocv_target_link_libraries
(
${
the_target
}
opencv_
nonfree
)
if
(
HAVE_opencv_
xfeatures2d
)
ocv_target_link_libraries
(
${
the_target
}
opencv_
xfeatures2d
)
endif
()
if
(
HAVE_opencv_cudacodec
)
ocv_target_link_libraries
(
${
the_target
}
opencv_cudacodec
)
...
...
samples/gpu/performance/CMakeLists.txt
浏览文件 @
b5d073ad
...
...
@@ -3,15 +3,15 @@ set(the_target "example_gpu_performance")
file
(
GLOB sources
"performance/*.cpp"
)
file
(
GLOB headers
"performance/*.h"
)
if
(
HAVE_opencv_
nonfree
)
ocv_include_directories
(
"
${
OpenCV_SOURCE_DIR
}
/modules/
nonfree
/include"
)
if
(
HAVE_opencv_
xfeatures2d
)
ocv_include_directories
(
"
${
OpenCV_SOURCE_DIR
}
/modules/
xfeatures2d
/include"
)
endif
()
add_executable
(
${
the_target
}
${
sources
}
${
headers
}
)
ocv_target_link_libraries
(
${
the_target
}
${
OPENCV_LINKER_LIBS
}
${
OPENCV_CUDA_SAMPLES_REQUIRED_DEPS
}
)
if
(
HAVE_opencv_
nonfree
)
ocv_target_link_libraries
(
${
the_target
}
opencv_
nonfree
)
if
(
HAVE_opencv_
xfeatures2d
)
ocv_target_link_libraries
(
${
the_target
}
opencv_
xfeatures2d
)
endif
()
set_target_properties
(
${
the_target
}
PROPERTIES
...
...
samples/gpu/performance/tests.cpp
浏览文件 @
b5d073ad
...
...
@@ -17,9 +17,9 @@
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_
NONFREE
#include "opencv2/
nonfree
/cuda.hpp"
#include "opencv2/
nonfree
/nonfree.hpp"
#ifdef HAVE_OPENCV_
XFEATURES2D
#include "opencv2/
xfeatures2d
/cuda.hpp"
#include "opencv2/
xfeatures2d
/nonfree.hpp"
#endif
using
namespace
std
;
...
...
@@ -274,7 +274,7 @@ TEST(meanShift)
}
}
#ifdef HAVE_OPENCV_
NONFREE
#ifdef HAVE_OPENCV_
XFEATURES2D
TEST
(
SURF
)
{
...
...
samples/gpu/surf_keypoint_matcher.cpp
浏览文件 @
b5d073ad
...
...
@@ -2,13 +2,13 @@
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_
NONFREE
#ifdef HAVE_OPENCV_
XFEATURES2D
#include "opencv2/core/core.hpp"
#include "opencv2/features2d/features2d.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/cudafeatures2d.hpp"
#include "opencv2/
nonfree
/cuda.hpp"
#include "opencv2/
xfeatures2d
/cuda.hpp"
using
namespace
std
;
using
namespace
cv
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录