Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
8c5b3c41
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,发现更多精彩内容 >>
提交
8c5b3c41
编写于
11月 26, 2020
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #17077 from i386x:check-negative-values
上级
f601e817
ce31c9c4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
165 addition
and
20 deletion
+165
-20
modules/core/src/matrix_wrap.cpp
modules/core/src/matrix_wrap.cpp
+12
-20
modules/core/test/test_mat.cpp
modules/core/test/test_mat.cpp
+153
-0
未找到文件。
modules/core/src/matrix_wrap.cpp
浏览文件 @
8c5b3c41
...
@@ -914,7 +914,7 @@ bool _InputArray::isContinuous(int i) const
...
@@ -914,7 +914,7 @@ bool _InputArray::isContinuous(int i) const
if
(
k
==
STD_ARRAY_MAT
)
if
(
k
==
STD_ARRAY_MAT
)
{
{
const
Mat
*
vv
=
(
const
Mat
*
)
obj
;
const
Mat
*
vv
=
(
const
Mat
*
)
obj
;
CV_Assert
(
i
>
0
&&
i
<
sz
.
height
);
CV_Assert
(
i
>
=
0
&&
i
<
sz
.
height
);
return
vv
[
i
].
isContinuous
();
return
vv
[
i
].
isContinuous
();
}
}
...
@@ -948,21 +948,21 @@ bool _InputArray::isSubmatrix(int i) const
...
@@ -948,21 +948,21 @@ bool _InputArray::isSubmatrix(int i) const
if
(
k
==
STD_VECTOR_MAT
)
if
(
k
==
STD_VECTOR_MAT
)
{
{
const
std
::
vector
<
Mat
>&
vv
=
*
(
const
std
::
vector
<
Mat
>*
)
obj
;
const
std
::
vector
<
Mat
>&
vv
=
*
(
const
std
::
vector
<
Mat
>*
)
obj
;
CV_Assert
((
size_t
)
i
<
vv
.
size
());
CV_Assert
(
i
>=
0
&&
(
size_t
)
i
<
vv
.
size
());
return
vv
[
i
].
isSubmatrix
();
return
vv
[
i
].
isSubmatrix
();
}
}
if
(
k
==
STD_ARRAY_MAT
)
if
(
k
==
STD_ARRAY_MAT
)
{
{
const
Mat
*
vv
=
(
const
Mat
*
)
obj
;
const
Mat
*
vv
=
(
const
Mat
*
)
obj
;
CV_Assert
(
i
<
sz
.
height
);
CV_Assert
(
i
>=
0
&&
i
<
sz
.
height
);
return
vv
[
i
].
isSubmatrix
();
return
vv
[
i
].
isSubmatrix
();
}
}
if
(
k
==
STD_VECTOR_UMAT
)
if
(
k
==
STD_VECTOR_UMAT
)
{
{
const
std
::
vector
<
UMat
>&
vv
=
*
(
const
std
::
vector
<
UMat
>*
)
obj
;
const
std
::
vector
<
UMat
>&
vv
=
*
(
const
std
::
vector
<
UMat
>*
)
obj
;
CV_Assert
((
size_t
)
i
<
vv
.
size
());
CV_Assert
(
i
>=
0
&&
(
size_t
)
i
<
vv
.
size
());
return
vv
[
i
].
isSubmatrix
();
return
vv
[
i
].
isSubmatrix
();
}
}
...
@@ -993,9 +993,7 @@ size_t _InputArray::offset(int i) const
...
@@ -993,9 +993,7 @@ size_t _InputArray::offset(int i) const
if
(
k
==
STD_VECTOR_MAT
)
if
(
k
==
STD_VECTOR_MAT
)
{
{
const
std
::
vector
<
Mat
>&
vv
=
*
(
const
std
::
vector
<
Mat
>*
)
obj
;
const
std
::
vector
<
Mat
>&
vv
=
*
(
const
std
::
vector
<
Mat
>*
)
obj
;
if
(
i
<
0
)
CV_Assert
(
i
>=
0
&&
i
<
(
int
)
vv
.
size
()
);
return
1
;
CV_Assert
(
i
<
(
int
)
vv
.
size
()
);
return
(
size_t
)(
vv
[
i
].
ptr
()
-
vv
[
i
].
datastart
);
return
(
size_t
)(
vv
[
i
].
ptr
()
-
vv
[
i
].
datastart
);
}
}
...
@@ -1003,16 +1001,14 @@ size_t _InputArray::offset(int i) const
...
@@ -1003,16 +1001,14 @@ size_t _InputArray::offset(int i) const
if
(
k
==
STD_ARRAY_MAT
)
if
(
k
==
STD_ARRAY_MAT
)
{
{
const
Mat
*
vv
=
(
const
Mat
*
)
obj
;
const
Mat
*
vv
=
(
const
Mat
*
)
obj
;
if
(
i
<
0
)
CV_Assert
(
i
>=
0
&&
i
<
sz
.
height
);
return
1
;
CV_Assert
(
i
<
sz
.
height
);
return
(
size_t
)(
vv
[
i
].
ptr
()
-
vv
[
i
].
datastart
);
return
(
size_t
)(
vv
[
i
].
ptr
()
-
vv
[
i
].
datastart
);
}
}
if
(
k
==
STD_VECTOR_UMAT
)
if
(
k
==
STD_VECTOR_UMAT
)
{
{
const
std
::
vector
<
UMat
>&
vv
=
*
(
const
std
::
vector
<
UMat
>*
)
obj
;
const
std
::
vector
<
UMat
>&
vv
=
*
(
const
std
::
vector
<
UMat
>*
)
obj
;
CV_Assert
((
size_t
)
i
<
vv
.
size
());
CV_Assert
(
i
>=
0
&&
(
size_t
)
i
<
vv
.
size
());
return
vv
[
i
].
offset
;
return
vv
[
i
].
offset
;
}
}
...
@@ -1026,7 +1022,7 @@ size_t _InputArray::offset(int i) const
...
@@ -1026,7 +1022,7 @@ size_t _InputArray::offset(int i) const
if
(
k
==
STD_VECTOR_CUDA_GPU_MAT
)
if
(
k
==
STD_VECTOR_CUDA_GPU_MAT
)
{
{
const
std
::
vector
<
cuda
::
GpuMat
>&
vv
=
*
(
const
std
::
vector
<
cuda
::
GpuMat
>*
)
obj
;
const
std
::
vector
<
cuda
::
GpuMat
>&
vv
=
*
(
const
std
::
vector
<
cuda
::
GpuMat
>*
)
obj
;
CV_Assert
((
size_t
)
i
<
vv
.
size
());
CV_Assert
(
i
>=
0
&&
(
size_t
)
i
<
vv
.
size
());
return
(
size_t
)(
vv
[
i
].
data
-
vv
[
i
].
datastart
);
return
(
size_t
)(
vv
[
i
].
data
-
vv
[
i
].
datastart
);
}
}
...
@@ -1056,25 +1052,21 @@ size_t _InputArray::step(int i) const
...
@@ -1056,25 +1052,21 @@ size_t _InputArray::step(int i) const
if
(
k
==
STD_VECTOR_MAT
)
if
(
k
==
STD_VECTOR_MAT
)
{
{
const
std
::
vector
<
Mat
>&
vv
=
*
(
const
std
::
vector
<
Mat
>*
)
obj
;
const
std
::
vector
<
Mat
>&
vv
=
*
(
const
std
::
vector
<
Mat
>*
)
obj
;
if
(
i
<
0
)
CV_Assert
(
i
>=
0
&&
i
<
(
int
)
vv
.
size
()
);
return
1
;
CV_Assert
(
i
<
(
int
)
vv
.
size
()
);
return
vv
[
i
].
step
;
return
vv
[
i
].
step
;
}
}
if
(
k
==
STD_ARRAY_MAT
)
if
(
k
==
STD_ARRAY_MAT
)
{
{
const
Mat
*
vv
=
(
const
Mat
*
)
obj
;
const
Mat
*
vv
=
(
const
Mat
*
)
obj
;
if
(
i
<
0
)
CV_Assert
(
i
>=
0
&&
i
<
sz
.
height
);
return
1
;
CV_Assert
(
i
<
sz
.
height
);
return
vv
[
i
].
step
;
return
vv
[
i
].
step
;
}
}
if
(
k
==
STD_VECTOR_UMAT
)
if
(
k
==
STD_VECTOR_UMAT
)
{
{
const
std
::
vector
<
UMat
>&
vv
=
*
(
const
std
::
vector
<
UMat
>*
)
obj
;
const
std
::
vector
<
UMat
>&
vv
=
*
(
const
std
::
vector
<
UMat
>*
)
obj
;
CV_Assert
((
size_t
)
i
<
vv
.
size
());
CV_Assert
(
i
>=
0
&&
(
size_t
)
i
<
vv
.
size
());
return
vv
[
i
].
step
;
return
vv
[
i
].
step
;
}
}
...
@@ -1086,7 +1078,7 @@ size_t _InputArray::step(int i) const
...
@@ -1086,7 +1078,7 @@ size_t _InputArray::step(int i) const
if
(
k
==
STD_VECTOR_CUDA_GPU_MAT
)
if
(
k
==
STD_VECTOR_CUDA_GPU_MAT
)
{
{
const
std
::
vector
<
cuda
::
GpuMat
>&
vv
=
*
(
const
std
::
vector
<
cuda
::
GpuMat
>*
)
obj
;
const
std
::
vector
<
cuda
::
GpuMat
>&
vv
=
*
(
const
std
::
vector
<
cuda
::
GpuMat
>*
)
obj
;
CV_Assert
((
size_t
)
i
<
vv
.
size
());
CV_Assert
(
i
>=
0
&&
(
size_t
)
i
<
vv
.
size
());
return
vv
[
i
].
step
;
return
vv
[
i
].
step
;
}
}
...
...
modules/core/test/test_mat.cpp
浏览文件 @
8c5b3c41
...
@@ -9,6 +9,8 @@
...
@@ -9,6 +9,8 @@
#include "opencv2/core/eigen.hpp"
#include "opencv2/core/eigen.hpp"
#endif
#endif
#include "opencv2/core/cuda.hpp"
namespace
opencv_test
{
namespace
{
namespace
opencv_test
{
namespace
{
class
Core_ReduceTest
:
public
cvtest
::
BaseTest
class
Core_ReduceTest
:
public
cvtest
::
BaseTest
...
@@ -1984,6 +1986,157 @@ TEST(Core_InputArray, fetch_MatExpr)
...
@@ -1984,6 +1986,157 @@ TEST(Core_InputArray, fetch_MatExpr)
}
}
#ifdef CV_CXX11
class
TestInputArrayRangeChecking
{
static
const
char
*
kind2str
(
cv
::
_InputArray
ia
)
{
switch
(
ia
.
kind
())
{
#define C(x) case cv::_InputArray::x: return #x
C
(
MAT
);
C
(
UMAT
);
C
(
EXPR
);
C
(
MATX
);
C
(
STD_VECTOR
);
C
(
STD_ARRAY
);
C
(
NONE
);
C
(
STD_VECTOR_VECTOR
);
C
(
STD_BOOL_VECTOR
);
C
(
STD_VECTOR_MAT
);
C
(
STD_ARRAY_MAT
);
C
(
STD_VECTOR_UMAT
);
C
(
CUDA_GPU_MAT
);
C
(
STD_VECTOR_CUDA_GPU_MAT
);
#undef C
default:
return
"<unsupported>"
;
}
}
static
void
banner
(
cv
::
_InputArray
ia
,
const
char
*
label
,
const
char
*
name
)
{
std
::
cout
<<
std
::
endl
<<
label
<<
" = "
<<
name
<<
", Kind: "
<<
kind2str
(
ia
)
<<
std
::
endl
;
}
template
<
typename
I
,
typename
F
>
static
void
testA
(
I
ia
,
F
f
,
const
char
*
mfname
)
{
banner
(
ia
,
"f"
,
mfname
);
EXPECT_THROW
(
f
(
ia
,
-
1
),
cv
::
Exception
)
<<
"f(ia, "
<<
-
1
<<
") should throw cv::Exception"
;
for
(
int
i
=
0
;
i
<
int
(
ia
.
size
());
i
++
)
{
EXPECT_NO_THROW
(
f
(
ia
,
i
))
<<
"f(ia, "
<<
i
<<
") should not throw an exception"
;
}
EXPECT_THROW
(
f
(
ia
,
int
(
ia
.
size
())),
cv
::
Exception
)
<<
"f(ia, "
<<
ia
.
size
()
<<
") should throw cv::Exception"
;
}
template
<
typename
I
,
typename
F
>
static
void
testB
(
I
ia
,
F
f
,
const
char
*
mfname
)
{
banner
(
ia
,
"f"
,
mfname
);
EXPECT_THROW
(
f
(
ia
,
-
1
),
cv
::
Exception
)
<<
"f(ia, "
<<
-
1
<<
") should throw cv::Exception"
;
for
(
int
i
=
0
;
i
<
int
(
ia
.
size
());
i
++
)
{
EXPECT_NO_THROW
(
f
(
ia
,
i
))
<<
"f(ia, "
<<
i
<<
") should not throw an exception"
;
}
EXPECT_THROW
(
f
(
ia
,
int
(
ia
.
size
())),
cv
::
Exception
)
<<
"f(ia, "
<<
ia
.
size
()
<<
") should throw cv::Exception"
;
}
static
void
test_isContinuous
()
{
auto
f
=
[](
cv
::
_InputArray
ia
,
int
i
)
{
(
void
)
ia
.
isContinuous
(
i
);
};
cv
::
Mat
M
;
cv
::
UMat
uM
;
std
::
vector
<
cv
::
Mat
>
vec
=
{
M
,
M
};
std
::
array
<
cv
::
Mat
,
2
>
arr
=
{
M
,
M
};
std
::
vector
<
cv
::
UMat
>
uvec
=
{
uM
,
uM
};
testA
(
vec
,
f
,
"isContinuous"
);
testA
(
arr
,
f
,
"isContinuous"
);
testA
(
uvec
,
f
,
"isContinuous"
);
}
static
void
test_isSubmatrix
()
{
auto
f
=
[](
cv
::
_InputArray
ia
,
int
i
)
{
(
void
)
ia
.
isSubmatrix
(
i
);
};
cv
::
Mat
M
;
cv
::
UMat
uM
;
std
::
vector
<
cv
::
Mat
>
vec
=
{
M
,
M
};
std
::
array
<
cv
::
Mat
,
2
>
arr
=
{
M
,
M
};
std
::
vector
<
cv
::
UMat
>
uvec
=
{
uM
,
uM
};
testA
(
vec
,
f
,
"isSubmatrix"
);
testA
(
arr
,
f
,
"isSubmatrix"
);
testA
(
uvec
,
f
,
"isSubmatrix"
);
}
static
void
test_offset
()
{
auto
f
=
[](
cv
::
_InputArray
ia
,
int
i
)
{
return
ia
.
offset
(
i
);
};
cv
::
Mat
M
;
cv
::
UMat
uM
;
cv
::
cuda
::
GpuMat
gM
;
std
::
vector
<
cv
::
Mat
>
vec
=
{
M
,
M
};
std
::
array
<
cv
::
Mat
,
2
>
arr
=
{
M
,
M
};
std
::
vector
<
cv
::
UMat
>
uvec
=
{
uM
,
uM
};
std
::
vector
<
cv
::
cuda
::
GpuMat
>
gvec
=
{
gM
,
gM
};
testB
(
vec
,
f
,
"offset"
);
testB
(
arr
,
f
,
"offset"
);
testB
(
uvec
,
f
,
"offset"
);
testB
(
gvec
,
f
,
"offset"
);
}
static
void
test_step
()
{
auto
f
=
[](
cv
::
_InputArray
ia
,
int
i
)
{
return
ia
.
step
(
i
);
};
cv
::
Mat
M
;
cv
::
UMat
uM
;
cv
::
cuda
::
GpuMat
gM
;
std
::
vector
<
cv
::
Mat
>
vec
=
{
M
,
M
};
std
::
array
<
cv
::
Mat
,
2
>
arr
=
{
M
,
M
};
std
::
vector
<
cv
::
UMat
>
uvec
=
{
uM
,
uM
};
std
::
vector
<
cv
::
cuda
::
GpuMat
>
gvec
=
{
gM
,
gM
};
testB
(
vec
,
f
,
"step"
);
testB
(
arr
,
f
,
"step"
);
testB
(
uvec
,
f
,
"step"
);
testB
(
gvec
,
f
,
"step"
);
}
public:
static
void
run
()
{
test_isContinuous
();
test_isSubmatrix
();
test_offset
();
test_step
();
}
};
TEST
(
Core_InputArray
,
range_checking
)
{
TestInputArrayRangeChecking
::
run
();
}
#endif
TEST
(
Core_Vectors
,
issue_13078
)
TEST
(
Core_Vectors
,
issue_13078
)
{
{
float
floats_
[]
=
{
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
};
float
floats_
[]
=
{
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录