Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
de55126b
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,发现更多精彩内容 >>
提交
de55126b
编写于
4月 27, 2014
作者:
S
Samson Yilma
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed warnings and parameter name mismatches, added #include needed in some platforms.
上级
e6420bde
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
13 deletion
+14
-13
modules/calib3d/include/opencv2/calib3d.hpp
modules/calib3d/include/opencv2/calib3d.hpp
+5
-5
modules/calib3d/src/homography_decomp.cpp
modules/calib3d/src/homography_decomp.cpp
+5
-4
modules/calib3d/test/test_homography_decomp.cpp
modules/calib3d/test/test_homography_decomp.cpp
+4
-4
未找到文件。
modules/calib3d/include/opencv2/calib3d.hpp
浏览文件 @
de55126b
...
...
@@ -314,11 +314,11 @@ CV_EXPORTS_W int estimateAffine3D(InputArray src, InputArray dst,
double
ransacThreshold
=
3
,
double
confidence
=
0.99
);
CV_EXPORTS_W
int
decomposeHomographyMat
(
InputArray
_
H
,
InputArray
_
K
,
OutputArrayOfArrays
_
rotations
,
OutputArrayOfArrays
_
translations
,
OutputArrayOfArrays
_
normals
);
CV_EXPORTS_W
int
decomposeHomographyMat
(
InputArray
H
,
InputArray
K
,
OutputArrayOfArrays
rotations
,
OutputArrayOfArrays
translations
,
OutputArrayOfArrays
normals
);
class
CV_EXPORTS_W
StereoMatcher
:
public
Algorithm
{
...
...
modules/calib3d/src/homography_decomp.cpp
浏览文件 @
de55126b
...
...
@@ -47,6 +47,7 @@
//M*/
#include "precomp.hpp"
#include <memory>
namespace
cv
{
...
...
@@ -189,7 +190,7 @@ void HomographyDecompZhang::decompose(std::vector<CameraMotion>& camMotions)
double
lambda1t3
=
lambda1
*
lambda3
;
double
t1
=
1.0
/
(
2.0
*
lambda1t3
);
double
t2
=
sqrt
f
(
1.0
+
4.0
*
lambda1t3
/
lambda1m3_2
);
double
t2
=
sqrt
(
1.0
+
4.0
*
lambda1t3
/
lambda1m3_2
);
double
t12
=
t1
*
t2
;
double
e1
=
-
t1
+
t12
;
//t1*(-1.0f + t2 );
...
...
@@ -197,8 +198,8 @@ void HomographyDecompZhang::decompose(std::vector<CameraMotion>& camMotions)
double
e1_2
=
e1
*
e1
;
double
e3_2
=
e3
*
e3
;
double
nv1p
=
sqrt
f
(
e1_2
*
lambda1m3_2
+
2
*
e1
*
(
lambda1t3
-
1
)
+
1.0
);
double
nv3p
=
sqrt
f
(
e3_2
*
lambda1m3_2
+
2
*
e3
*
(
lambda1t3
-
1
)
+
1.0
);
double
nv1p
=
sqrt
(
e1_2
*
lambda1m3_2
+
2
*
e1
*
(
lambda1t3
-
1
)
+
1.0
);
double
nv3p
=
sqrt
(
e3_2
*
lambda1m3_2
+
2
*
e3
*
(
lambda1t3
-
1
)
+
1.0
);
double
v1p
[
3
],
v3p
[
3
];
v1p
[
0
]
=
Vt
.
at
<
double
>
(
0
)
*
nv1p
,
v1p
[
1
]
=
Vt
.
at
<
double
>
(
1
)
*
nv1p
,
v1p
[
2
]
=
Vt
.
at
<
double
>
(
2
)
*
nv1p
;
...
...
@@ -378,7 +379,7 @@ void HomographyDecompInria::decompose(std::vector<CameraMotion>& camMotions)
}
double
traceS
=
S
(
0
,
0
)
+
S
(
1
,
1
)
+
S
(
2
,
2
);
double
v
=
2.0
*
sqrt
f
(
1
+
traceS
-
M00
-
M11
-
M22
);
double
v
=
2.0
*
sqrt
(
1
+
traceS
-
M00
-
M11
-
M22
);
double
ESii
=
signd
(
S
(
indx
,
indx
))
;
double
r_2
=
2
+
traceS
+
v
;
...
...
modules/calib3d/test/test_homography_decomp.cpp
浏览文件 @
de55126b
...
...
@@ -68,9 +68,9 @@ protected:
decomposeHomographyMat
(
_H
,
_K
,
rotations
,
translations
,
normals
);
//there should be at least 1 solution
ASSERT_GT
(
rotations
.
size
(
),
0
);
ASSERT_GT
(
translations
.
size
(
),
0
);
ASSERT_GT
(
normals
.
size
(
),
0
);
ASSERT_GT
(
static_cast
<
int
>
(
rotations
.
size
()
),
0
);
ASSERT_GT
(
static_cast
<
int
>
(
translations
.
size
()
),
0
);
ASSERT_GT
(
static_cast
<
int
>
(
normals
.
size
()
),
0
);
ASSERT_EQ
(
rotations
.
size
(),
normals
.
size
());
ASSERT_EQ
(
translations
.
size
(),
normals
.
size
());
...
...
@@ -78,7 +78,7 @@ protected:
ASSERT_TRUE
(
containsValidMotion
(
rotations
,
translations
,
normals
));
decomposeHomographyMat
(
_H
,
_K
,
rotations
,
noArray
(),
noArray
());
ASSERT_GT
(
rotations
.
size
(
),
0
);
ASSERT_GT
(
static_cast
<
int
>
(
rotations
.
size
()
),
0
);
}
private:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录