Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
b1722352
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,发现更多精彩内容 >>
提交
b1722352
编写于
11月 29, 2010
作者:
V
Vadim Pisarevsky
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixed severe bug: CV_RANSAC != CV_FM_RANSAC, CV_LMEDS != CV_FM_LMEDS
上级
2b660bf5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
21 deletion
+23
-21
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
+20
-18
samples/cpp/watershed.cpp
samples/cpp/watershed.cpp
+3
-3
未找到文件。
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
浏览文件 @
b1722352
...
...
@@ -77,10 +77,15 @@ CVAPI(void) cvConvertPointsHomogeneous( const CvMat* src, CvMat* dst );
/* Calculates fundamental matrix given a set of corresponding points */
#define CV_FM_7POINT 1
#define CV_FM_8POINT 2
#define CV_FM_LMEDS_ONLY 8
#define CV_FM_RANSAC_ONLY 4
#define CV_FM_LMEDS 8
#define CV_FM_RANSAC 4
#define CV_LMEDS 4
#define CV_RANSAC 8
#define CV_FM_LMEDS_ONLY CV_LMEDS
#define CV_FM_RANSAC_ONLY CV_RANSAC
#define CV_FM_LMEDS CV_LMEDS
#define CV_FM_RANSAC CV_RANSAC
CVAPI
(
int
)
cvFindFundamentalMat
(
const
CvMat
*
points1
,
const
CvMat
*
points2
,
CvMat
*
fundamental_matrix
,
int
method
CV_DEFAULT
(
CV_FM_RANSAC
),
...
...
@@ -120,9 +125,6 @@ CVAPI(void) cvGetOptimalNewCameraMatrix( const CvMat* camera_matrix,
CVAPI
(
int
)
cvRodrigues2
(
const
CvMat
*
src
,
CvMat
*
dst
,
CvMat
*
jacobian
CV_DEFAULT
(
0
)
);
#define CV_LMEDS 4
#define CV_RANSAC 8
/* Finds perspective transformation between the object plane and image (view) plane */
CVAPI
(
int
)
cvFindHomography
(
const
CvMat
*
src_points
,
const
CvMat
*
dst_points
,
...
...
@@ -438,8 +440,8 @@ CV_EXPORTS_AS(RodriguesJ) void Rodrigues(const Mat& src, CV_OUT Mat& dst, CV_OUT
//! type of the robust estimation algorithm
enum
{
LMEDS
=
4
,
//!< least-median algorithm
RANSAC
=
8
//!< RANSAC algorithm
LMEDS
=
CV_LMEDS
,
//!< least-median algorithm
RANSAC
=
CV_RANSAC
//!< RANSAC algorithm
};
//! computes the best-fit perspective transformation mapping srcPoints to dstPoints.
...
...
@@ -543,11 +545,11 @@ CV_EXPORTS void drawChessboardCorners( Mat& image, Size patternSize,
enum
{
CALIB_USE_INTRINSIC_GUESS
=
1
,
CALIB_FIX_ASPECT_RATIO
=
2
,
CALIB_FIX_PRINCIPAL_POINT
=
4
,
CALIB_ZERO_TANGENT_DIST
=
8
,
CALIB_FIX_FOCAL_LENGTH
=
16
,
CALIB_USE_INTRINSIC_GUESS
=
CV_CALIB_USE_INTRINSIC_GUESS
,
CALIB_FIX_ASPECT_RATIO
=
CV_CALIB_FIX_ASPECT_RATIO
,
CALIB_FIX_PRINCIPAL_POINT
=
CV_CALIB_FIX_PRINCIPAL_POINT
,
CALIB_ZERO_TANGENT_DIST
=
CV_CALIB_ZERO_TANGENT_DIST
,
CALIB_FIX_FOCAL_LENGTH
=
CV_CALIB_FIX_FOCAL_LENGTH
,
CALIB_FIX_K1
=
CV_CALIB_FIX_K1
,
CALIB_FIX_K2
=
CV_CALIB_FIX_K2
,
CALIB_FIX_K3
=
CV_CALIB_FIX_K3
,
...
...
@@ -645,10 +647,10 @@ CV_EXPORTS void convertPointsHomogeneous( const Mat& src, CV_OUT vector<Point2f>
//! the algorithm for finding fundamental matrix
enum
{
FM_7POINT
=
1
,
//!< 7-point algorithm
FM_8POINT
=
2
,
//!< 8-point algorithm
FM_LMEDS
=
4
,
//!< least-median algorithm
FM_RANSAC
=
8
//!< RANSAC algorithm
FM_7POINT
=
CV_FM_7POINT
,
//!< 7-point algorithm
FM_8POINT
=
CV_FM_8POINT
,
//!< 8-point algorithm
FM_LMEDS
=
CV_FM_LMEDS
,
//!< least-median algorithm
FM_RANSAC
=
CV_FM_RANSAC
//!< RANSAC algorithm
};
//! finds fundamental matrix from a set of corresponding 2D points
...
...
samples/cpp/watershed.cpp
浏览文件 @
b1722352
...
...
@@ -92,9 +92,9 @@ int main( int argc, char** argv )
vector
<
Vec3b
>
colorTab
;
for
(
i
=
0
;
i
<
compCount
;
i
++
)
{
int
b
=
theRNG
().
uniform
(
180
,
230
);
int
g
=
theRNG
().
uniform
(
180
,
230
);
int
r
=
theRNG
().
uniform
(
180
,
230
);
int
b
=
theRNG
().
uniform
(
0
,
255
);
int
g
=
theRNG
().
uniform
(
0
,
255
);
int
r
=
theRNG
().
uniform
(
0
,
255
);
colorTab
.
push_back
(
Vec3b
((
uchar
)
b
,
(
uchar
)
g
,
(
uchar
)
r
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录