Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
c751e901
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,发现更多精彩内容 >>
提交
c751e901
编写于
6月 12, 2010
作者:
V
Victor Erukhimov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Changed interface for drawMatches
上级
b34f0a2f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
9 addition
and
9 deletion
+9
-9
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
+3
-3
modules/features2d/src/descriptors.cpp
modules/features2d/src/descriptors.cpp
+3
-3
samples/cpp/descriptor_extractor_matcher.cpp
samples/cpp/descriptor_extractor_matcher.cpp
+2
-2
samples/cpp/matcher_simple.cpp
samples/cpp/matcher_simple.cpp
+1
-1
未找到文件。
modules/features2d/include/opencv2/features2d/features2d.hpp
浏览文件 @
c751e901
...
@@ -2137,9 +2137,9 @@ struct CV_EXPORTS DrawMatchesFlags
...
@@ -2137,9 +2137,9 @@ struct CV_EXPORTS DrawMatchesFlags
};
};
// Draws matches of keypints from two images on output image.
// Draws matches of keypints from two images on output image.
CV_EXPORTS
void
drawMatches
(
const
Mat
&
img1
,
const
Mat
&
img2
,
CV_EXPORTS
void
drawMatches
(
const
Mat
&
img1
,
const
vector
<
KeyPoint
>&
keypoints1
,
const
vector
<
KeyPoint
>&
keypoints1
,
const
vector
<
KeyPoint
>&
keypoints2
,
const
Mat
&
img2
,
const
vector
<
KeyPoint
>&
keypoints2
,
const
vector
<
int
>&
matches
,
const
vector
<
char
>&
mask
,
Mat
&
outImg
,
const
vector
<
int
>&
matches
,
Mat
&
outImg
,
const
vector
<
char
>&
mask
=
vector
<
char
>
()
,
const
Scalar
&
matchColor
=
Scalar
::
all
(
-
1
),
const
Scalar
&
singlePointColor
=
Scalar
::
all
(
-
1
),
const
Scalar
&
matchColor
=
Scalar
::
all
(
-
1
),
const
Scalar
&
singlePointColor
=
Scalar
::
all
(
-
1
),
int
flags
=
DrawMatchesFlags
::
DEFAULT
);
int
flags
=
DrawMatchesFlags
::
DEFAULT
);
...
...
modules/features2d/src/descriptors.cpp
浏览文件 @
c751e901
...
@@ -45,9 +45,9 @@ using namespace std;
...
@@ -45,9 +45,9 @@ using namespace std;
namespace
cv
namespace
cv
{
{
CV_EXPORTS
void
drawMatches
(
const
Mat
&
img1
,
const
Mat
&
img2
,
CV_EXPORTS
void
drawMatches
(
const
Mat
&
img1
,
const
vector
<
KeyPoint
>&
keypoints1
,
const
vector
<
KeyPoint
>&
keypoints1
,
const
vector
<
KeyPoint
>&
keypoints2
,
const
Mat
&
img2
,
const
vector
<
KeyPoint
>&
keypoints2
,
const
vector
<
int
>&
matches
,
const
vector
<
char
>&
mask
,
Mat
&
outImg
,
const
vector
<
int
>&
matches
,
Mat
&
outImg
,
const
vector
<
char
>&
mask
,
const
Scalar
&
matchColor
,
const
Scalar
&
singlePointColor
,
const
Scalar
&
matchColor
,
const
Scalar
&
singlePointColor
,
int
flags
)
int
flags
)
{
{
...
...
samples/cpp/descriptor_extractor_matcher.cpp
浏览文件 @
c751e901
...
@@ -98,7 +98,7 @@ void doIteration( const Mat& img1, Mat& img2, bool isWarpPerspective,
...
@@ -98,7 +98,7 @@ void doIteration( const Mat& img1, Mat& img2, bool isWarpPerspective,
mask
[
i1
]
=
1
;
mask
[
i1
]
=
1
;
}
}
// draw inliers
// draw inliers
drawMatches
(
img1
,
img2
,
keypoints1
,
keypoints2
,
matches
,
mask
,
drawImg
,
CV_RGB
(
0
,
255
,
0
),
CV_RGB
(
0
,
0
,
255
)
);
drawMatches
(
img1
,
keypoints1
,
img2
,
keypoints2
,
matches
,
drawImg
,
mask
,
CV_RGB
(
0
,
255
,
0
),
CV_RGB
(
0
,
0
,
255
)
);
// draw outliers
// draw outliers
/*for( size_t i1 = 0; i1 < mask.size(); i1++ )
/*for( size_t i1 = 0; i1 < mask.size(); i1++ )
mask[i1] = !mask[i1];
mask[i1] = !mask[i1];
...
@@ -107,7 +107,7 @@ void doIteration( const Mat& img1, Mat& img2, bool isWarpPerspective,
...
@@ -107,7 +107,7 @@ void doIteration( const Mat& img1, Mat& img2, bool isWarpPerspective,
}
}
else
else
{
{
drawMatches
(
img1
,
img2
,
keypoints1
,
keypoints2
,
matches
,
vector
<
char
>
(),
drawImg
,
CV_RGB
(
0
,
255
,
0
)
);
drawMatches
(
img1
,
keypoints1
,
img2
,
keypoints2
,
matches
,
drawImg
,
vector
<
char
>
()
,
CV_RGB
(
0
,
255
,
0
)
);
}
}
imshow
(
winName
,
drawImg
);
imshow
(
winName
,
drawImg
);
...
...
samples/cpp/matcher_simple.cpp
浏览文件 @
c751e901
...
@@ -42,7 +42,7 @@ int main(int argc, char** argv)
...
@@ -42,7 +42,7 @@ int main(int argc, char** argv)
// drawing the results
// drawing the results
namedWindow
(
"matches"
,
1
);
namedWindow
(
"matches"
,
1
);
Mat
img_matches
;
Mat
img_matches
;
drawMatches
(
img1
,
img2
,
keypoints1
,
keypoints2
,
matches
,
vector
<
char
>
()
,
img_matches
);
drawMatches
(
img1
,
keypoints1
,
img2
,
keypoints2
,
matches
,
img_matches
);
imshow
(
"matches"
,
img_matches
);
imshow
(
"matches"
,
img_matches
);
waitKey
(
0
);
waitKey
(
0
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录