Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
c5088ca1
Commit
c5088ca1
authored
Jun 19, 2011
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added explicit Mat_<T>::Mat_(const MatExpr&) (resolves ticket #996)
parent
5d047af0
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
core.hpp
modules/core/include/opencv2/core/core.hpp
+4
-2
mat.hpp
modules/core/include/opencv2/core/mat.hpp
+5
-1
No files found.
modules/core/include/opencv2/core/core.hpp
View file @
c5088ca1
...
...
@@ -2535,6 +2535,8 @@ public:
Mat_
(
const
Mat_
&
m
,
const
Rect
&
roi
);
//! selects a submatrix, n-dim version
Mat_
(
const
Mat_
&
m
,
const
Range
*
ranges
);
//! from a matrix expression
explicit
Mat_
(
const
MatExpr
&
e
);
//! makes a matrix out of Vec, std::vector, Point_ or Point3_. The matrix will have a single column
explicit
Mat_
(
const
vector
<
_Tp
>&
vec
,
bool
copyData
=
false
);
template
<
int
n
>
explicit
Mat_
(
const
Vec
<
typename
DataType
<
_Tp
>::
channel_type
,
n
>&
vec
,
bool
copyData
=
true
);
...
...
@@ -2547,6 +2549,8 @@ public:
Mat_
&
operator
=
(
const
Mat_
&
m
);
//! set all the elements to s.
Mat_
&
operator
=
(
const
_Tp
&
s
);
//! assign a matrix expression
Mat_
&
operator
=
(
const
MatExpr
&
e
);
//! iterators; they are smart enough to skip gaps in the end of rows
iterator
begin
();
...
...
@@ -2562,8 +2566,6 @@ public:
void
create
(
int
_ndims
,
const
int
*
_sizes
);
//! cross-product
Mat_
cross
(
const
Mat_
&
m
)
const
;
//! to support complex matrix expressions
Mat_
&
operator
=
(
const
MatExpr
&
expr
);
//! data type conversion
template
<
typename
T2
>
operator
Mat_
<
T2
>
()
const
;
//! overridden forms of Mat::row() etc.
...
...
modules/core/include/opencv2/core/mat.hpp
View file @
c5088ca1
...
...
@@ -893,7 +893,6 @@ template<typename _Tp> inline Mat_<_Tp>& Mat_<_Tp>::operator = (const _Tp& s)
return
*
this
;
}
template
<
typename
_Tp
>
inline
void
Mat_
<
_Tp
>::
create
(
int
_rows
,
int
_cols
)
{
Mat
::
create
(
_rows
,
_cols
,
DataType
<
_Tp
>::
type
);
...
...
@@ -1335,6 +1334,11 @@ inline Mat& Mat::operator = (const MatExpr& e)
return
*
this
;
}
template
<
typename
_Tp
>
inline
Mat_
<
_Tp
>::
Mat_
(
const
MatExpr
&
e
)
{
e
.
op
->
assign
(
e
,
*
this
,
DataType
<
_Tp
>::
type
);
}
template
<
typename
_Tp
>
Mat_
<
_Tp
>&
Mat_
<
_Tp
>::
operator
=
(
const
MatExpr
&
e
)
{
e
.
op
->
assign
(
e
,
*
this
,
DataType
<
_Tp
>::
type
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment