Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
江流儿的夏天
opencv
提交
8a415c88
O
opencv
项目概览
江流儿的夏天
/
opencv
与 Fork 源项目一致
Fork自
OpenCV / opencv
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
8a415c88
编写于
9月 06, 2023
作者:
Y
Yuriy Chernyshov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add missing std namespace qualifiers
上级
f6473821
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
26 addition
and
26 deletion
+26
-26
modules/calib3d/test/test_affine2d_estimator.cpp
modules/calib3d/test/test_affine2d_estimator.cpp
+2
-2
modules/calib3d/test/test_affine3d_estimator.cpp
modules/calib3d/test/test_affine3d_estimator.cpp
+2
-2
modules/calib3d/test/test_affine_partial2d_estimator.cpp
modules/calib3d/test/test_affine_partial2d_estimator.cpp
+2
-2
modules/calib3d/test/test_stereomatching.cpp
modules/calib3d/test/test_stereomatching.cpp
+4
-4
modules/calib3d/test/test_translation3d_estimator.cpp
modules/calib3d/test/test_translation3d_estimator.cpp
+2
-2
modules/core/test/test_countnonzero.cpp
modules/core/test/test_countnonzero.cpp
+1
-1
modules/features2d/test/test_descriptors_regression.cpp
modules/features2d/test/test_descriptors_regression.cpp
+1
-1
modules/imgproc/test/test_histograms.cpp
modules/imgproc/test/test_histograms.cpp
+2
-2
modules/objdetect/src/qrcode.cpp
modules/objdetect/src/qrcode.cpp
+9
-9
modules/objdetect/test/test_cascadeandhog.cpp
modules/objdetect/test/test_cascadeandhog.cpp
+1
-1
未找到文件。
modules/calib3d/test/test_affine2d_estimator.cpp
浏览文件 @
8a415c88
...
...
@@ -115,8 +115,8 @@ TEST_P(EstimateAffine2D, testNPoints)
EXPECT_NEAR
(
0.
,
cvtest
::
norm
(
aff_est
,
aff
,
NORM_INF
),
1e-4
);
bool
inliers_good
=
count
(
inliers
.
begin
(),
inliers
.
end
(),
1
)
==
m
&&
m
==
accumulate
(
inliers
.
begin
(),
inliers
.
begin
()
+
m
,
0
);
bool
inliers_good
=
std
::
count
(
inliers
.
begin
(),
inliers
.
end
(),
1
)
==
m
&&
m
==
std
::
accumulate
(
inliers
.
begin
(),
inliers
.
begin
()
+
m
,
0
);
EXPECT_TRUE
(
inliers_good
);
}
...
...
modules/calib3d/test/test_affine3d_estimator.cpp
浏览文件 @
8a415c88
...
...
@@ -160,8 +160,8 @@ bool CV_Affine3D_EstTest::testNPoints()
return
false
;
}
bool
outl_good
=
count
(
outl
.
begin
(),
outl
.
end
(),
1
)
==
m
&&
m
==
accumulate
(
outl
.
begin
(),
outl
.
begin
()
+
m
,
0
);
bool
outl_good
=
std
::
count
(
outl
.
begin
(),
outl
.
end
(),
1
)
==
m
&&
m
==
std
::
accumulate
(
outl
.
begin
(),
outl
.
begin
()
+
m
,
0
);
if
(
!
outl_good
)
{
...
...
modules/calib3d/test/test_affine_partial2d_estimator.cpp
浏览文件 @
8a415c88
...
...
@@ -125,8 +125,8 @@ TEST_P(EstimateAffinePartial2D, testNPoints)
EXPECT_NEAR
(
0.
,
cvtest
::
norm
(
aff_est
,
aff
,
NORM_INF
),
1e-4
);
bool
inliers_good
=
count
(
inliers
.
begin
(),
inliers
.
end
(),
1
)
==
m
&&
m
==
accumulate
(
inliers
.
begin
(),
inliers
.
begin
()
+
m
,
0
);
bool
inliers_good
=
std
::
count
(
inliers
.
begin
(),
inliers
.
end
(),
1
)
==
m
&&
m
==
std
::
accumulate
(
inliers
.
begin
(),
inliers
.
begin
()
+
m
,
0
);
EXPECT_TRUE
(
inliers_good
);
}
...
...
modules/calib3d/test/test_stereomatching.cpp
浏览文件 @
8a415c88
...
...
@@ -740,8 +740,8 @@ public:
CV_StereoBMTest
()
{
name
=
"stereobm"
;
fill
(
rmsEps
.
begin
(),
rmsEps
.
end
(),
0.4
f
);
fill
(
fracEps
.
begin
(),
fracEps
.
end
(),
0.022
f
);
std
::
fill
(
rmsEps
.
begin
(),
rmsEps
.
end
(),
0.4
f
);
std
::
fill
(
fracEps
.
begin
(),
fracEps
.
end
(),
0.022
f
);
}
protected:
...
...
@@ -866,8 +866,8 @@ public:
CV_StereoSGBMTest
()
{
name
=
"stereosgbm"
;
fill
(
rmsEps
.
begin
(),
rmsEps
.
end
(),
0.25
f
);
fill
(
fracEps
.
begin
(),
fracEps
.
end
(),
0.01
f
);
std
::
fill
(
rmsEps
.
begin
(),
rmsEps
.
end
(),
0.25
f
);
std
::
fill
(
fracEps
.
begin
(),
fracEps
.
end
(),
0.01
f
);
}
protected:
...
...
modules/calib3d/test/test_translation3d_estimator.cpp
浏览文件 @
8a415c88
...
...
@@ -91,8 +91,8 @@ TEST(Calib3d_EstimateTranslation3D, testNPoints)
<<
"aff est: "
<<
trans_est
<<
endl
<<
"aff ref: "
<<
trans
;
bool
outl_good
=
count
(
outl
.
begin
(),
outl
.
end
(),
1
)
==
m
&&
m
==
accumulate
(
outl
.
begin
(),
outl
.
begin
()
+
m
,
0
);
bool
outl_good
=
std
::
count
(
outl
.
begin
(),
outl
.
end
(),
1
)
==
m
&&
m
==
std
::
accumulate
(
outl
.
begin
(),
outl
.
begin
()
+
m
,
0
);
EXPECT_TRUE
(
outl_good
);
}
...
...
modules/core/test/test_countnonzero.cpp
浏览文件 @
8a415c88
...
...
@@ -259,7 +259,7 @@ TEST_P (CountNonZeroND, ndim)
const
int
ONE_SIZE
=
5
;
vector
<
int
>
sizes
(
dims
);
fill
(
sizes
.
begin
(),
sizes
.
end
(),
ONE_SIZE
);
std
::
fill
(
sizes
.
begin
(),
sizes
.
end
(),
ONE_SIZE
);
Mat
data
(
sizes
,
CV_MAKETYPE
(
type
,
1
));
data
=
0
;
...
...
modules/features2d/test/test_descriptors_regression.cpp
浏览文件 @
8a415c88
...
...
@@ -142,7 +142,7 @@ TEST_P(DescriptorImage, no_crash)
{
vector
<
String
>
fnames
;
glob
(
cvtest
::
TS
::
ptr
()
->
get_data_path
()
+
pattern
,
fnames
,
false
);
sort
(
fnames
.
begin
(),
fnames
.
end
());
s
td
::
s
ort
(
fnames
.
begin
(),
fnames
.
end
());
Ptr
<
AKAZE
>
akaze_mldb
=
AKAZE
::
create
(
AKAZE
::
DESCRIPTOR_MLDB
);
Ptr
<
AKAZE
>
akaze_mldb_upright
=
AKAZE
::
create
(
AKAZE
::
DESCRIPTOR_MLDB_UPRIGHT
);
...
...
modules/imgproc/test/test_histograms.cpp
浏览文件 @
8a415c88
...
...
@@ -1198,7 +1198,7 @@ void CV_CalcHistTest::run_func(void)
}
std
::
vector
<
cv
::
Mat
>
imagesv
(
cdims
);
copy
(
images
.
begin
(),
images
.
begin
()
+
cdims
,
imagesv
.
begin
());
std
::
copy
(
images
.
begin
(),
images
.
begin
()
+
cdims
,
imagesv
.
begin
());
Mat
mask
=
images
[
CV_MAX_DIM
];
if
(
!
CV_IS_SPARSE_HIST
(
hist
[
0
])
)
...
...
@@ -1493,7 +1493,7 @@ void CV_CalcBackProjectTest::run_func(void)
}
std
::
vector
<
cv
::
Mat
>
imagesv
(
hdims
);
copy
(
images
.
begin
(),
images
.
begin
()
+
hdims
,
imagesv
.
begin
());
std
::
copy
(
images
.
begin
(),
images
.
begin
()
+
hdims
,
imagesv
.
begin
());
cv
::
Mat
dst
=
images
[
CV_MAX_DIM
+
1
];
...
...
modules/objdetect/src/qrcode.cpp
浏览文件 @
8a415c88
...
...
@@ -1249,14 +1249,14 @@ bool QRDecode::computeSidesPoints(const vector<Point> &result_integer_hull)
{
if
(
points
.
front
().
x
>
points
.
back
().
x
)
{
reverse
(
points
.
begin
(),
points
.
end
());
std
::
reverse
(
points
.
begin
(),
points
.
end
());
}
}
else
{
if
(
points
.
front
().
y
>
points
.
back
().
y
)
{
reverse
(
points
.
begin
(),
points
.
end
());
std
::
reverse
(
points
.
begin
(),
points
.
end
());
}
}
if
(
points
.
empty
())
...
...
@@ -1632,7 +1632,7 @@ bool QRDecode::findPatternsVerticesPoints(vector<vector<Point> > &patterns_verti
}
if
((
int
)
min_angle_pnts_indexes
.
size
()
==
num_vertices
)
{
break
;
}
}
sort
(
min_angle_pnts_indexes
.
begin
(),
min_angle_pnts_indexes
.
end
());
s
td
::
s
ort
(
min_angle_pnts_indexes
.
begin
(),
min_angle_pnts_indexes
.
end
());
vector
<
Point
>
contour_vertices_points
;
...
...
@@ -1761,11 +1761,11 @@ bool QRDecode::findTempPatternsAddingPoints(vector<std::pair<int, vector<Point>
}
if
(
abs
(
p1
.
x
-
p2
.
x
)
>
abs
(
p1
.
y
-
p2
.
y
))
{
sort
(
points
.
begin
(),
points
.
end
(),
sortPointsByX
());
s
td
::
s
ort
(
points
.
begin
(),
points
.
end
(),
sortPointsByX
());
}
else
{
sort
(
points
.
begin
(),
points
.
end
(),
sortPointsByY
());
s
td
::
s
ort
(
points
.
begin
(),
points
.
end
(),
sortPointsByY
());
}
temp_patterns_add_points
.
push_back
(
std
::
pair
<
int
,
vector
<
Point
>
>
(
idx_curved_side
,
points
));
...
...
@@ -1909,11 +1909,11 @@ void QRDecode::completeAndSortSides()
Point
p2
=
it
->
second
.
back
();
if
(
abs
(
p1
.
x
-
p2
.
x
)
>
abs
(
p1
.
y
-
p2
.
y
))
{
sort
(
it
->
second
.
begin
(),
it
->
second
.
end
(),
sortPointsByX
());
s
td
::
s
ort
(
it
->
second
.
begin
(),
it
->
second
.
end
(),
sortPointsByX
());
}
else
{
sort
(
it
->
second
.
begin
(),
it
->
second
.
end
(),
sortPointsByY
());
s
td
::
s
ort
(
it
->
second
.
begin
(),
it
->
second
.
end
(),
sortPointsByY
());
}
}
}
...
...
@@ -2075,8 +2075,8 @@ bool QRDecode::divideIntoEvenSegments(vector<vector<Point2f> > &segments_points)
Point2f
segment_start
=
segments_points
[
i
][
j
];
Point2f
segment_end
=
segments_points
[
i
][
j
+
1
];
vector
<
Point2f
>::
iterator
it_start
,
it_end
,
it
;
it_start
=
find
(
spline_lines
[
i
].
begin
(),
spline_lines
[
i
].
end
(),
segment_start
);
it_end
=
find
(
spline_lines
[
i
].
begin
(),
spline_lines
[
i
].
end
(),
segment_end
);
it_start
=
std
::
find
(
spline_lines
[
i
].
begin
(),
spline_lines
[
i
].
end
(),
segment_start
);
it_end
=
std
::
find
(
spline_lines
[
i
].
begin
(),
spline_lines
[
i
].
end
(),
segment_end
);
float
max_dist_to_line
=
0.0
;
for
(
it
=
it_start
;
it
!=
it_end
;
it
++
)
{
...
...
modules/objdetect/test/test_cascadeandhog.cpp
浏览文件 @
8a415c88
...
...
@@ -355,7 +355,7 @@ int CV_DetectorTest::validate( int detectorIdx, vector<vector<Rect> >& objects )
map
[
minIdx
]
=
1
;
}
}
noPair
+=
(
int
)
count_if
(
map
.
begin
(),
map
.
end
(),
isZero
);
noPair
+=
(
int
)
std
::
count_if
(
map
.
begin
(),
map
.
end
(),
isZero
);
totalNoPair
+=
noPair
;
/*if( noPair > cvRound(valRects.size()*eps.noPair)+1 )
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录