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
fe241657
Commit
fe241657
authored
May 03, 2017
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8432 from csukuangfj:issue-8411
parents
ea49d7b7
94521629
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
mat.hpp
modules/core/include/opencv2/core/mat.hpp
+2
-0
mat.inl.hpp
modules/core/include/opencv2/core/mat.inl.hpp
+8
-0
No files found.
modules/core/include/opencv2/core/mat.hpp
View file @
fe241657
...
...
@@ -179,6 +179,7 @@ public:
template
<
typename
_Tp
>
_InputArray
(
const
std
::
vector
<
_Tp
>&
vec
);
_InputArray
(
const
std
::
vector
<
bool
>&
vec
);
template
<
typename
_Tp
>
_InputArray
(
const
std
::
vector
<
std
::
vector
<
_Tp
>
>&
vec
);
_InputArray
(
const
std
::
vector
<
std
::
vector
<
bool
>
>&
);
template
<
typename
_Tp
>
_InputArray
(
const
std
::
vector
<
Mat_
<
_Tp
>
>&
vec
);
template
<
typename
_Tp
>
_InputArray
(
const
_Tp
*
vec
,
int
n
);
template
<
typename
_Tp
,
int
m
,
int
n
>
_InputArray
(
const
Matx
<
_Tp
,
m
,
n
>&
matx
);
...
...
@@ -300,6 +301,7 @@ public:
template
<
typename
_Tp
>
_OutputArray
(
std
::
vector
<
_Tp
>&
vec
);
_OutputArray
(
std
::
vector
<
bool
>&
vec
);
template
<
typename
_Tp
>
_OutputArray
(
std
::
vector
<
std
::
vector
<
_Tp
>
>&
vec
);
_OutputArray
(
std
::
vector
<
std
::
vector
<
bool
>
>&
);
template
<
typename
_Tp
>
_OutputArray
(
std
::
vector
<
Mat_
<
_Tp
>
>&
vec
);
template
<
typename
_Tp
>
_OutputArray
(
Mat_
<
_Tp
>&
m
);
template
<
typename
_Tp
>
_OutputArray
(
_Tp
*
vec
,
int
n
);
...
...
modules/core/include/opencv2/core/mat.inl.hpp
View file @
fe241657
...
...
@@ -95,6 +95,10 @@ template<typename _Tp> inline
_InputArray
::
_InputArray
(
const
std
::
vector
<
std
::
vector
<
_Tp
>
>&
vec
)
{
init
(
FIXED_TYPE
+
STD_VECTOR_VECTOR
+
DataType
<
_Tp
>::
type
+
ACCESS_READ
,
&
vec
);
}
inline
_InputArray
::
_InputArray
(
const
std
::
vector
<
std
::
vector
<
bool
>
>&
)
{
CV_Error
(
Error
::
StsUnsupportedFormat
,
"std::vector<std::vector<bool> > is not supported!
\n
"
);
}
template
<
typename
_Tp
>
inline
_InputArray
::
_InputArray
(
const
std
::
vector
<
Mat_
<
_Tp
>
>&
vec
)
{
init
(
FIXED_TYPE
+
STD_VECTOR_MAT
+
DataType
<
_Tp
>::
type
+
ACCESS_READ
,
&
vec
);
}
...
...
@@ -179,6 +183,10 @@ template<typename _Tp> inline
_OutputArray
::
_OutputArray
(
std
::
vector
<
std
::
vector
<
_Tp
>
>&
vec
)
{
init
(
FIXED_TYPE
+
STD_VECTOR_VECTOR
+
DataType
<
_Tp
>::
type
+
ACCESS_WRITE
,
&
vec
);
}
inline
_OutputArray
::
_OutputArray
(
std
::
vector
<
std
::
vector
<
bool
>
>&
)
{
CV_Error
(
Error
::
StsUnsupportedFormat
,
"std::vector<std::vector<bool> > cannot be an output array
\n
"
);
}
template
<
typename
_Tp
>
inline
_OutputArray
::
_OutputArray
(
std
::
vector
<
Mat_
<
_Tp
>
>&
vec
)
{
init
(
FIXED_TYPE
+
STD_VECTOR_MAT
+
DataType
<
_Tp
>::
type
+
ACCESS_WRITE
,
&
vec
);
}
...
...
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