Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
e19a12f6
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,发现更多精彩内容 >>
提交
e19a12f6
编写于
10月 30, 2014
作者:
V
Vadim Pisarevsky
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3361 from mshabunin:fix-drawing
上级
cae89a7a
071e78d0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
9 deletion
+16
-9
modules/imgcodecs/test/test_drawing.cpp
modules/imgcodecs/test/test_drawing.cpp
+9
-5
modules/imgcodecs/test/test_grfmt.cpp
modules/imgcodecs/test/test_grfmt.cpp
+6
-3
modules/videoio/test/test_basic_props.cpp
modules/videoio/test/test_basic_props.cpp
+1
-1
未找到文件。
modules/imgcodecs/test/test_drawing.cpp
浏览文件 @
e19a12f6
...
...
@@ -75,11 +75,12 @@ void CV_DrawingTest::run( int )
}
else
{
float
err
=
(
float
)
cvtest
::
norm
(
testImg
,
valImg
,
CV_RELATIVE_L1
);
float
Eps
=
0.9
f
;
// image should match exactly
float
err
=
(
float
)
cvtest
::
norm
(
testImg
,
valImg
,
NORM_L1
);
float
Eps
=
1
;
if
(
err
>
Eps
)
{
ts
->
printf
(
ts
->
LOG
,
"
CV_RELATIVE
_L1 between testImg and valImg is equal %f (larger than %f)
\n
"
,
err
,
Eps
);
ts
->
printf
(
ts
->
LOG
,
"
NORM
_L1 between testImg and valImg is equal %f (larger than %f)
\n
"
,
err
,
Eps
);
ts
->
set_failed_test_info
(
cvtest
::
TS
::
FAIL_BAD_ACCURACY
);
}
else
...
...
@@ -261,6 +262,7 @@ void CV_DrawingTest_C::draw( Mat& _img )
polyline
[
3
]
=
cvPoint
(
0
,
imgSize
.
height
);
CvPoint
*
pts
=
&
polyline
[
0
];
int
n
=
(
int
)
polyline
.
size
();
int
actualSize
=
0
;
cvFillPoly
(
&
img
,
&
pts
,
&
n
,
1
,
cvScalar
(
255
,
255
,
255
)
);
CvPoint
p1
=
cvPoint
(
1
,
1
),
p2
=
cvPoint
(
3
,
3
);
...
...
@@ -290,7 +292,8 @@ void CV_DrawingTest_C::draw( Mat& _img )
polyline
.
resize
(
9
);
pts
=
&
polyline
[
0
];
n
=
(
int
)
polyline
.
size
();
assert
(
cvEllipse2Poly
(
cvPoint
(
430
,
180
),
cvSize
(
100
,
150
),
30
,
0
,
150
,
&
polyline
[
0
],
20
)
==
n
);
actualSize
=
cvEllipse2Poly
(
cvPoint
(
430
,
180
),
cvSize
(
100
,
150
),
30
,
0
,
150
,
&
polyline
[
0
],
20
);
CV_Assert
(
actualSize
==
n
);
cvPolyLine
(
&
img
,
&
pts
,
&
n
,
1
,
false
,
cvScalar
(
0
,
0
,
150
),
4
,
CV_AA
);
n
=
0
;
for
(
vector
<
CvPoint
>::
const_iterator
it
=
polyline
.
begin
();
n
<
(
int
)
polyline
.
size
()
-
1
;
++
it
,
n
++
)
...
...
@@ -301,7 +304,8 @@ void CV_DrawingTest_C::draw( Mat& _img )
polyline
.
resize
(
19
);
pts
=
&
polyline
[
0
];
n
=
(
int
)
polyline
.
size
();
assert
(
cvEllipse2Poly
(
cvPoint
(
500
,
300
),
cvSize
(
50
,
80
),
0
,
0
,
180
,
&
polyline
[
0
],
10
)
==
n
);
actualSize
=
cvEllipse2Poly
(
cvPoint
(
500
,
300
),
cvSize
(
50
,
80
),
0
,
0
,
180
,
&
polyline
[
0
],
10
);
CV_Assert
(
actualSize
==
n
);
cvPolyLine
(
&
img
,
&
pts
,
&
n
,
1
,
true
,
Scalar
(
100
,
200
,
100
),
20
);
cvFillConvexPoly
(
&
img
,
pts
,
n
,
cvScalar
(
0
,
80
,
0
)
);
...
...
modules/imgcodecs/test/test_grfmt.cpp
浏览文件 @
e19a12f6
...
...
@@ -147,10 +147,13 @@ public:
CV_Assert
(
img
.
size
()
==
img_test
.
size
());
CV_Assert
(
img
.
type
()
==
img_test
.
type
());
double
n
=
cvtest
::
norm
(
img
,
img_test
,
NORM_L2
);
if
(
n
>
1.0
)
// JPEG format does not provide 100% accuracy
// using fuzzy image comparison
double
n
=
cvtest
::
norm
(
img
,
img_test
,
NORM_L1
);
double
expected
=
0.05
*
img
.
size
().
area
();
if
(
n
>
expected
)
{
ts
->
printf
(
ts
->
LOG
,
"norm = %f
\n
"
,
n
);
ts
->
printf
(
ts
->
LOG
,
"norm = %f
> expected = %f
\n
"
,
n
,
expected
);
ts
->
set_failed_test_info
(
ts
->
FAIL_MISMATCH
);
}
}
...
...
modules/videoio/test/test_basic_props.cpp
浏览文件 @
e19a12f6
...
...
@@ -108,7 +108,7 @@ TEST(Videoio_Video, actual_resolution)
}
}
TEST
(
Videoio_Video
,
prop_fps
)
TEST
(
Videoio_Video
,
DISABLED_
prop_fps
)
{
const
size_t
n
=
sizeof
(
ext
)
/
sizeof
(
ext
[
0
]);
const
string
src_dir
=
TS
::
ptr
()
->
get_data_path
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录