Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
0c4a8e2c
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,发现更多精彩内容 >>
提交
0c4a8e2c
编写于
10月 01, 2020
作者:
M
Maksym Ivashechkin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
change flags and bugfix graph
上级
a3e7c2d8
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
11 addition
and
7 deletion
+11
-7
modules/calib3d/src/fundam.cpp
modules/calib3d/src/fundam.cpp
+2
-2
modules/calib3d/src/ptsetreg.cpp
modules/calib3d/src/ptsetreg.cpp
+1
-1
modules/calib3d/src/solvepnp.cpp
modules/calib3d/src/solvepnp.cpp
+1
-1
modules/calib3d/src/usac/local_optimization.cpp
modules/calib3d/src/usac/local_optimization.cpp
+7
-3
未找到文件。
modules/calib3d/src/fundam.cpp
浏览文件 @
0c4a8e2c
...
...
@@ -355,7 +355,7 @@ cv::Mat cv::findHomography( InputArray _points1, InputArray _points2,
{
CV_INSTRUMENT_REGION
();
if
(
method
>=
32
&&
method
<=
38
)
if
(
method
>=
USAC_DEFAULT
&&
method
<=
USAC_MAGSAC
)
return
usac
::
findHomography
(
_points1
,
_points2
,
method
,
ransacReprojThreshold
,
_mask
,
maxIters
,
confidence
);
...
...
@@ -831,7 +831,7 @@ cv::Mat cv::findFundamentalMat( InputArray _points1, InputArray _points2,
{
CV_INSTRUMENT_REGION
();
if
(
method
>=
32
&&
method
<=
38
)
if
(
method
>=
USAC_DEFAULT
&&
method
<=
USAC_MAGSAC
)
return
usac
::
findFundamentalMat
(
_points1
,
_points2
,
method
,
ransacReprojThreshold
,
confidence
,
maxIters
,
_mask
);
...
...
modules/calib3d/src/ptsetreg.cpp
浏览文件 @
0c4a8e2c
...
...
@@ -930,7 +930,7 @@ Mat estimateAffine2D(InputArray _from, InputArray _to, OutputArray _inliers,
const
size_t
refineIters
)
{
if
(
method
>=
32
&&
method
<=
38
)
if
(
method
>=
USAC_DEFAULT
&&
method
<=
USAC_MAGSAC
)
return
cv
::
usac
::
estimateAffine2D
(
_from
,
_to
,
_inliers
,
method
,
ransacReprojThreshold
,
(
int
)
maxIters
,
confidence
,
(
int
)
refineIters
);
...
...
modules/calib3d/src/solvepnp.cpp
浏览文件 @
0c4a8e2c
...
...
@@ -205,7 +205,7 @@ bool solvePnPRansac(InputArray _opoints, InputArray _ipoints,
{
CV_INSTRUMENT_REGION
();
if
(
flags
>=
32
&&
flags
<=
38
)
if
(
flags
>=
USAC_DEFAULT
&&
flags
<=
USAC_MAGSAC
)
return
usac
::
solvePnPRansac
(
_opoints
,
_ipoints
,
_cameraMatrix
,
_distCoeffs
,
_rvec
,
_tvec
,
useExtrinsicGuess
,
iterationsCount
,
reprojectionError
,
confidence
,
_inliers
,
flags
);
...
...
modules/calib3d/src/usac/local_optimization.cpp
浏览文件 @
0c4a8e2c
...
...
@@ -136,6 +136,7 @@ private:
std
::
fill
(
used_edges
.
begin
(),
used_edges
.
end
(),
false
);
bool
has_edges
=
false
;
// Iterate through all points and set their edges
for
(
int
point_idx
=
0
;
point_idx
<
points_size
;
++
point_idx
)
{
energy
=
energies
[
point_idx
];
...
...
@@ -154,9 +155,8 @@ private:
b
=
spatial_coherence
,
c
=
spatial_coherence
,
d
=
0
;
graph
.
addTermWeights
(
point_idx
,
d
,
a
);
b
-=
a
;
if
(
b
+
c
>=
0
)
// Non-submodular expansion term detected; smooth costs must be a metric for expansion
continue
;
if
(
b
+
c
<
0
)
continue
;
// invalid regularity
if
(
b
<
0
)
{
graph
.
addTermWeights
(
point_idx
,
0
,
b
);
graph
.
addTermWeights
(
actual_neighbor_idx
,
0
,
-
b
);
...
...
@@ -167,9 +167,13 @@ private:
graph
.
addEdges
(
point_idx
,
actual_neighbor_idx
,
b
+
c
,
0
);
}
else
graph
.
addEdges
(
point_idx
,
actual_neighbor_idx
,
b
,
c
);
has_edges
=
true
;
}
}
if
(
!
has_edges
)
return
quality
->
getInliers
(
model
,
labeling_inliers
);
graph
.
maxFlow
();
int
inlier_number
=
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录