Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
6f175a3c
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,发现更多精彩内容 >>
提交
6f175a3c
编写于
9月 20, 2012
作者:
V
Vladislav Vinogradov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
changed the type of the arguments to const reference (Bug #2376)
ORB_GPU::downloadKeyPoints ORB_GPU::convertKeyPoints
上级
2e363386
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
12 deletion
+12
-12
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
+2
-2
modules/gpu/src/orb.cpp
modules/gpu/src/orb.cpp
+10
-10
未找到文件。
modules/gpu/include/opencv2/gpu/gpu.hpp
浏览文件 @
6f175a3c
...
...
@@ -1690,9 +1690,9 @@ public:
void
operator
()(
const
GpuMat
&
image
,
const
GpuMat
&
mask
,
GpuMat
&
keypoints
,
GpuMat
&
descriptors
);
//! download keypoints from device to host memory
static
void
downloadKeyPoints
(
GpuMat
&
d_keypoints
,
std
::
vector
<
KeyPoint
>&
keypoints
);
static
void
downloadKeyPoints
(
const
GpuMat
&
d_keypoints
,
std
::
vector
<
KeyPoint
>&
keypoints
);
//! convert keypoints to KeyPoint vector
static
void
convertKeyPoints
(
Mat
&
d_keypoints
,
std
::
vector
<
KeyPoint
>&
keypoints
);
static
void
convertKeyPoints
(
const
Mat
&
d_keypoints
,
std
::
vector
<
KeyPoint
>&
keypoints
);
//! returns the descriptor size in bytes
inline
int
descriptorSize
()
const
{
return
kBytes
;
}
...
...
modules/gpu/src/orb.cpp
浏览文件 @
6f175a3c
...
...
@@ -53,8 +53,8 @@ void cv::gpu::ORB_GPU::operator()(const GpuMat&, const GpuMat&, std::vector<KeyP
void
cv
::
gpu
::
ORB_GPU
::
operator
()(
const
GpuMat
&
,
const
GpuMat
&
,
GpuMat
&
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
ORB_GPU
::
operator
()(
const
GpuMat
&
,
const
GpuMat
&
,
std
::
vector
<
KeyPoint
>&
,
GpuMat
&
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
ORB_GPU
::
operator
()(
const
GpuMat
&
,
const
GpuMat
&
,
GpuMat
&
,
GpuMat
&
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
ORB_GPU
::
downloadKeyPoints
(
GpuMat
&
,
std
::
vector
<
KeyPoint
>&
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
ORB_GPU
::
convertKeyPoints
(
Mat
&
,
std
::
vector
<
KeyPoint
>&
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
ORB_GPU
::
downloadKeyPoints
(
const
GpuMat
&
,
std
::
vector
<
KeyPoint
>&
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
ORB_GPU
::
convertKeyPoints
(
const
Mat
&
,
std
::
vector
<
KeyPoint
>&
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
ORB_GPU
::
release
()
{
throw_nogpu
();
}
void
cv
::
gpu
::
ORB_GPU
::
buildScalePyramids
(
const
GpuMat
&
,
const
GpuMat
&
)
{
throw_nogpu
();
}
void
cv
::
gpu
::
ORB_GPU
::
computeKeyPointsPyramid
()
{
throw_nogpu
();
}
...
...
@@ -685,7 +685,7 @@ void cv::gpu::ORB_GPU::mergeKeyPoints(GpuMat& keypoints)
}
}
void
cv
::
gpu
::
ORB_GPU
::
downloadKeyPoints
(
GpuMat
&
d_keypoints
,
std
::
vector
<
KeyPoint
>&
keypoints
)
void
cv
::
gpu
::
ORB_GPU
::
downloadKeyPoints
(
const
GpuMat
&
d_keypoints
,
std
::
vector
<
KeyPoint
>&
keypoints
)
{
if
(
d_keypoints
.
empty
())
{
...
...
@@ -698,7 +698,7 @@ void cv::gpu::ORB_GPU::downloadKeyPoints(GpuMat& d_keypoints, std::vector<KeyPoi
convertKeyPoints
(
h_keypoints
,
keypoints
);
}
void
cv
::
gpu
::
ORB_GPU
::
convertKeyPoints
(
Mat
&
d_keypoints
,
std
::
vector
<
KeyPoint
>&
keypoints
)
void
cv
::
gpu
::
ORB_GPU
::
convertKeyPoints
(
const
Mat
&
d_keypoints
,
std
::
vector
<
KeyPoint
>&
keypoints
)
{
if
(
d_keypoints
.
empty
())
{
...
...
@@ -708,12 +708,12 @@ void cv::gpu::ORB_GPU::convertKeyPoints(Mat& d_keypoints, std::vector<KeyPoint>&
CV_Assert
(
d_keypoints
.
type
()
==
CV_32FC1
&&
d_keypoints
.
rows
==
ROWS_COUNT
);
float
*
x_ptr
=
d_keypoints
.
ptr
<
float
>
(
X_ROW
);
float
*
y_ptr
=
d_keypoints
.
ptr
<
float
>
(
Y_ROW
);
float
*
response_ptr
=
d_keypoints
.
ptr
<
float
>
(
RESPONSE_ROW
);
float
*
angle_ptr
=
d_keypoints
.
ptr
<
float
>
(
ANGLE_ROW
);
float
*
octave_ptr
=
d_keypoints
.
ptr
<
float
>
(
OCTAVE_ROW
);
float
*
size_ptr
=
d_keypoints
.
ptr
<
float
>
(
SIZE_ROW
);
const
float
*
x_ptr
=
d_keypoints
.
ptr
<
float
>
(
X_ROW
);
const
float
*
y_ptr
=
d_keypoints
.
ptr
<
float
>
(
Y_ROW
);
const
float
*
response_ptr
=
d_keypoints
.
ptr
<
float
>
(
RESPONSE_ROW
);
const
float
*
angle_ptr
=
d_keypoints
.
ptr
<
float
>
(
ANGLE_ROW
);
const
float
*
octave_ptr
=
d_keypoints
.
ptr
<
float
>
(
OCTAVE_ROW
);
const
float
*
size_ptr
=
d_keypoints
.
ptr
<
float
>
(
SIZE_ROW
);
keypoints
.
resize
(
d_keypoints
.
cols
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录