Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
b416e871
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,发现更多精彩内容 >>
提交
b416e871
编写于
1月 15, 2015
作者:
V
Vladislav Vinogradov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
move labeling routines from cuda to cudalegacy
上级
3f1fb281
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
29 addition
and
28 deletion
+29
-28
modules/cuda/include/opencv2/cuda.hpp
modules/cuda/include/opencv2/cuda.hpp
+0
-23
modules/cudalegacy/include/opencv2/cudalegacy.hpp
modules/cudalegacy/include/opencv2/cudalegacy.hpp
+24
-0
modules/cudalegacy/perf/perf_labeling.cpp
modules/cudalegacy/perf/perf_labeling.cpp
+0
-0
modules/cudalegacy/src/cuda/ccomponetns.cu
modules/cudalegacy/src/cuda/ccomponetns.cu
+0
-0
modules/cudalegacy/src/graphcuts.cpp
modules/cudalegacy/src/graphcuts.cpp
+0
-0
modules/cudalegacy/test/test_labeling.cpp
modules/cudalegacy/test/test_labeling.cpp
+0
-0
modules/stitching/CMakeLists.txt
modules/stitching/CMakeLists.txt
+1
-1
modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
...itching/include/opencv2/stitching/detail/seam_finders.hpp
+1
-1
modules/stitching/src/precomp.hpp
modules/stitching/src/precomp.hpp
+2
-2
modules/stitching/src/seam_finders.cpp
modules/stitching/src/seam_finders.cpp
+1
-1
未找到文件。
modules/cuda/include/opencv2/cuda.hpp
浏览文件 @
b416e871
...
...
@@ -58,29 +58,6 @@
namespace
cv
{
namespace
cuda
{
//////////////////////////// Labeling ////////////////////////////
//! @addtogroup cuda
//! @{
//!performs labeling via graph cuts of a 2D regular 4-connected graph.
CV_EXPORTS
void
graphcut
(
GpuMat
&
terminals
,
GpuMat
&
leftTransp
,
GpuMat
&
rightTransp
,
GpuMat
&
top
,
GpuMat
&
bottom
,
GpuMat
&
labels
,
GpuMat
&
buf
,
Stream
&
stream
=
Stream
::
Null
());
//!performs labeling via graph cuts of a 2D regular 8-connected graph.
CV_EXPORTS
void
graphcut
(
GpuMat
&
terminals
,
GpuMat
&
leftTransp
,
GpuMat
&
rightTransp
,
GpuMat
&
top
,
GpuMat
&
topLeft
,
GpuMat
&
topRight
,
GpuMat
&
bottom
,
GpuMat
&
bottomLeft
,
GpuMat
&
bottomRight
,
GpuMat
&
labels
,
GpuMat
&
buf
,
Stream
&
stream
=
Stream
::
Null
());
//! compute mask for Generalized Flood fill componetns labeling.
CV_EXPORTS
void
connectivityMask
(
const
GpuMat
&
image
,
GpuMat
&
mask
,
const
cv
::
Scalar
&
lo
,
const
cv
::
Scalar
&
hi
,
Stream
&
stream
=
Stream
::
Null
());
//! performs connected componnents labeling.
CV_EXPORTS
void
labelComponents
(
const
GpuMat
&
mask
,
GpuMat
&
components
,
int
flags
=
0
,
Stream
&
stream
=
Stream
::
Null
());
//! @}
//////////////////////////// Calib3d ////////////////////////////
//! @addtogroup cuda_calib3d
...
...
modules/cudalegacy/include/opencv2/cudalegacy.hpp
浏览文件 @
b416e871
...
...
@@ -63,6 +63,10 @@ namespace cv { namespace cuda {
//! @addtogroup cudalegacy
//! @{
//
// ImagePyramid
//
class
CV_EXPORTS
ImagePyramid
:
public
Algorithm
{
public:
...
...
@@ -227,6 +231,26 @@ CV_EXPORTS void interpolateFrames(const GpuMat& frame0, const GpuMat& frame1,
CV_EXPORTS
void
createOpticalFlowNeedleMap
(
const
GpuMat
&
u
,
const
GpuMat
&
v
,
GpuMat
&
vertex
,
GpuMat
&
colors
);
//
// Labeling
//
//!performs labeling via graph cuts of a 2D regular 4-connected graph.
CV_EXPORTS
void
graphcut
(
GpuMat
&
terminals
,
GpuMat
&
leftTransp
,
GpuMat
&
rightTransp
,
GpuMat
&
top
,
GpuMat
&
bottom
,
GpuMat
&
labels
,
GpuMat
&
buf
,
Stream
&
stream
=
Stream
::
Null
());
//!performs labeling via graph cuts of a 2D regular 8-connected graph.
CV_EXPORTS
void
graphcut
(
GpuMat
&
terminals
,
GpuMat
&
leftTransp
,
GpuMat
&
rightTransp
,
GpuMat
&
top
,
GpuMat
&
topLeft
,
GpuMat
&
topRight
,
GpuMat
&
bottom
,
GpuMat
&
bottomLeft
,
GpuMat
&
bottomRight
,
GpuMat
&
labels
,
GpuMat
&
buf
,
Stream
&
stream
=
Stream
::
Null
());
//! compute mask for Generalized Flood fill componetns labeling.
CV_EXPORTS
void
connectivityMask
(
const
GpuMat
&
image
,
GpuMat
&
mask
,
const
cv
::
Scalar
&
lo
,
const
cv
::
Scalar
&
hi
,
Stream
&
stream
=
Stream
::
Null
());
//! performs connected componnents labeling.
CV_EXPORTS
void
labelComponents
(
const
GpuMat
&
mask
,
GpuMat
&
components
,
int
flags
=
0
,
Stream
&
stream
=
Stream
::
Null
());
//! @}
}}
...
...
modules/cuda/perf/perf_labeling.cpp
→
modules/cuda
legacy
/perf/perf_labeling.cpp
浏览文件 @
b416e871
文件已移动
modules/cuda/src/cuda/ccomponetns.cu
→
modules/cuda
legacy
/src/cuda/ccomponetns.cu
浏览文件 @
b416e871
文件已移动
modules/cuda/src/graphcuts.cpp
→
modules/cuda
legacy
/src/graphcuts.cpp
浏览文件 @
b416e871
文件已移动
modules/cuda/test/test_labeling.cpp
→
modules/cuda
legacy
/test/test_labeling.cpp
浏览文件 @
b416e871
文件已移动
modules/stitching/CMakeLists.txt
浏览文件 @
b416e871
...
...
@@ -5,4 +5,4 @@ if(HAVE_CUDA)
endif
()
ocv_define_module
(
stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect
OPTIONAL opencv_cuda opencv_cudaarithm opencv_cudafilters opencv_cudafeatures2d opencv_xfeatures2d
)
OPTIONAL opencv_cuda opencv_cudaarithm opencv_cudafilters opencv_cudafeatures2d opencv_
cudalegacy opencv_
xfeatures2d
)
modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
浏览文件 @
b416e871
...
...
@@ -249,7 +249,7 @@ private:
};
#ifdef HAVE_OPENCV_CUDA
#ifdef HAVE_OPENCV_CUDA
LEGACY
class
CV_EXPORTS
GraphCutSeamFinderGpu
:
public
GraphCutSeamFinderBase
,
public
PairwiseSeamFinder
{
public:
...
...
modules/stitching/src/precomp.hpp
浏览文件 @
b416e871
...
...
@@ -83,8 +83,8 @@
# include "opencv2/cudafeatures2d.hpp"
#endif
#ifdef HAVE_OPENCV_CUDA
# include "opencv2/cuda.hpp"
#ifdef HAVE_OPENCV_CUDA
LEGACY
# include "opencv2/cuda
legacy
.hpp"
#endif
#ifdef HAVE_OPENCV_XFEATURES2D
...
...
modules/stitching/src/seam_finders.cpp
浏览文件 @
b416e871
...
...
@@ -1321,7 +1321,7 @@ void GraphCutSeamFinder::find(const std::vector<UMat> &src, const std::vector<Po
}
#ifdef HAVE_OPENCV_CUDA
#ifdef HAVE_OPENCV_CUDA
LEGACY
void
GraphCutSeamFinderGpu
::
find
(
const
std
::
vector
<
UMat
>
&
src
,
const
std
::
vector
<
Point
>
&
corners
,
std
::
vector
<
UMat
>
&
masks
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录