Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
mxpx_RB
opencv
提交
1b0f781b
O
opencv
项目概览
mxpx_RB
/
opencv
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
未验证
提交
1b0f781b
编写于
3月 01, 2021
作者:
D
Dale Phurrough
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
noexcept def construct Mat, UMat, Mat_, MatSize, MatStep
上级
eb82ba36
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
24 addition
and
24 deletion
+24
-24
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/mat.hpp
+12
-12
modules/core/include/opencv2/core/mat.inl.hpp
modules/core/include/opencv2/core/mat.inl.hpp
+9
-9
modules/core/src/matrix.cpp
modules/core/src/matrix.cpp
+2
-2
modules/core/src/umatrix.cpp
modules/core/src/umatrix.cpp
+1
-1
未找到文件。
modules/core/include/opencv2/core/mat.hpp
浏览文件 @
1b0f781b
...
...
@@ -576,24 +576,24 @@ CV_ENUM_FLAGS(UMatData::MemoryFlag)
struct
CV_EXPORTS
MatSize
{
explicit
MatSize
(
int
*
_p
);
int
dims
()
const
;
explicit
MatSize
(
int
*
_p
)
CV_NOEXCEPT
;
int
dims
()
const
CV_NOEXCEPT
;
Size
operator
()()
const
;
const
int
&
operator
[](
int
i
)
const
;
int
&
operator
[](
int
i
);
operator
const
int
*
()
const
;
// TODO OpenCV 4.0: drop this
bool
operator
==
(
const
MatSize
&
sz
)
const
;
bool
operator
!=
(
const
MatSize
&
sz
)
const
;
operator
const
int
*
()
const
CV_NOEXCEPT
;
// TODO OpenCV 4.0: drop this
bool
operator
==
(
const
MatSize
&
sz
)
const
CV_NOEXCEPT
;
bool
operator
!=
(
const
MatSize
&
sz
)
const
CV_NOEXCEPT
;
int
*
p
;
};
struct
CV_EXPORTS
MatStep
{
MatStep
();
explicit
MatStep
(
size_t
s
);
const
size_t
&
operator
[](
int
i
)
const
;
size_t
&
operator
[](
int
i
);
MatStep
()
CV_NOEXCEPT
;
explicit
MatStep
(
size_t
s
)
CV_NOEXCEPT
;
const
size_t
&
operator
[](
int
i
)
const
CV_NOEXCEPT
;
size_t
&
operator
[](
int
i
)
CV_NOEXCEPT
;
operator
size_t
()
const
;
MatStep
&
operator
=
(
size_t
s
);
...
...
@@ -807,7 +807,7 @@ public:
The constructed matrix can further be assigned to another matrix or matrix expression or can be
allocated with Mat::create . In the former case, the old content is de-referenced.
*/
Mat
();
Mat
()
CV_NOEXCEPT
;
/** @overload
@param rows Number of rows in a 2D array.
...
...
@@ -2193,7 +2193,7 @@ public:
typedef
MatConstIterator_
<
_Tp
>
const_iterator
;
//! default constructor
Mat_
();
Mat_
()
CV_NOEXCEPT
;
//! equivalent to Mat(_rows, _cols, DataType<_Tp>::type)
Mat_
(
int
_rows
,
int
_cols
);
//! constructor that sets each matrix element to specified value
...
...
@@ -2385,7 +2385,7 @@ class CV_EXPORTS UMat
{
public:
//! default constructor
UMat
(
UMatUsageFlags
usageFlags
=
USAGE_DEFAULT
);
UMat
(
UMatUsageFlags
usageFlags
=
USAGE_DEFAULT
)
CV_NOEXCEPT
;
//! constructs 2D matrix of the specified size and type
// (_type is CV_8UC1, CV_64FC3, CV_32SC(12) etc.)
UMat
(
int
rows
,
int
cols
,
int
type
,
UMatUsageFlags
usageFlags
=
USAGE_DEFAULT
);
...
...
modules/core/include/opencv2/core/mat.inl.hpp
浏览文件 @
1b0f781b
...
...
@@ -1116,11 +1116,11 @@ void Mat::push_back(const std::vector<_Tp>& v)
///////////////////////////// MatSize ////////////////////////////
inline
MatSize
::
MatSize
(
int
*
_p
)
MatSize
::
MatSize
(
int
*
_p
)
CV_NOEXCEPT
:
p
(
_p
)
{}
inline
int
MatSize
::
dims
()
const
int
MatSize
::
dims
()
const
CV_NOEXCEPT
{
return
(
p
-
1
)[
0
];
}
...
...
@@ -1153,13 +1153,13 @@ int& MatSize::operator[](int i)
}
inline
MatSize
::
operator
const
int
*
()
const
MatSize
::
operator
const
int
*
()
const
CV_NOEXCEPT
{
return
p
;
}
inline
bool
MatSize
::
operator
!=
(
const
MatSize
&
sz
)
const
bool
MatSize
::
operator
!=
(
const
MatSize
&
sz
)
const
CV_NOEXCEPT
{
return
!
(
*
this
==
sz
);
}
...
...
@@ -1169,25 +1169,25 @@ bool MatSize::operator != (const MatSize& sz) const
///////////////////////////// MatStep ////////////////////////////
inline
MatStep
::
MatStep
()
MatStep
::
MatStep
()
CV_NOEXCEPT
{
p
=
buf
;
p
[
0
]
=
p
[
1
]
=
0
;
}
inline
MatStep
::
MatStep
(
size_t
s
)
MatStep
::
MatStep
(
size_t
s
)
CV_NOEXCEPT
{
p
=
buf
;
p
[
0
]
=
s
;
p
[
1
]
=
0
;
}
inline
const
size_t
&
MatStep
::
operator
[](
int
i
)
const
const
size_t
&
MatStep
::
operator
[](
int
i
)
const
CV_NOEXCEPT
{
return
p
[
i
];
}
inline
size_t
&
MatStep
::
operator
[](
int
i
)
size_t
&
MatStep
::
operator
[](
int
i
)
CV_NOEXCEPT
{
return
p
[
i
];
}
...
...
@@ -1210,7 +1210,7 @@ inline MatStep& MatStep::operator = (size_t s)
////////////////////////////// Mat_<_Tp> ////////////////////////////
template
<
typename
_Tp
>
inline
Mat_
<
_Tp
>::
Mat_
()
Mat_
<
_Tp
>::
Mat_
()
CV_NOEXCEPT
:
Mat
()
{
flags
=
(
flags
&
~
CV_MAT_TYPE_MASK
)
+
traits
::
Type
<
_Tp
>::
value
;
...
...
modules/core/src/matrix.cpp
浏览文件 @
1b0f781b
...
...
@@ -204,7 +204,7 @@ MatAllocator* Mat::getStdAllocator()
//==================================================================================================
bool
MatSize
::
operator
==
(
const
MatSize
&
sz
)
const
bool
MatSize
::
operator
==
(
const
MatSize
&
sz
)
const
CV_NOEXCEPT
{
int
d
=
dims
();
int
dsz
=
sz
.
dims
();
...
...
@@ -337,7 +337,7 @@ void finalizeHdr(Mat& m)
//======================================= Mat ======================================================
Mat
::
Mat
()
Mat
::
Mat
()
CV_NOEXCEPT
:
flags
(
MAGIC_VAL
),
dims
(
0
),
rows
(
0
),
cols
(
0
),
data
(
0
),
datastart
(
0
),
dataend
(
0
),
datalimit
(
0
),
allocator
(
0
),
u
(
0
),
size
(
&
rows
),
step
(
0
)
{}
...
...
modules/core/src/umatrix.cpp
浏览文件 @
1b0f781b
...
...
@@ -230,7 +230,7 @@ UMatDataAutoLock::~UMatDataAutoLock()
//////////////////////////////// UMat ////////////////////////////////
UMat
::
UMat
(
UMatUsageFlags
_usageFlags
)
UMat
::
UMat
(
UMatUsageFlags
_usageFlags
)
CV_NOEXCEPT
:
flags
(
MAGIC_VAL
),
dims
(
0
),
rows
(
0
),
cols
(
0
),
allocator
(
0
),
usageFlags
(
_usageFlags
),
u
(
0
),
offset
(
0
),
size
(
&
rows
)
{}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录