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
acfdd0e1
Commit
acfdd0e1
authored
Aug 27, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
core: fix MSVS "unreachable code" warnings
parent
9fb8f634
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
19 deletions
+7
-19
mat.hpp
modules/core/include/opencv2/core/mat.hpp
+4
-4
mat.inl.hpp
modules/core/include/opencv2/core/mat.inl.hpp
+0
-15
inpainting.cpp
modules/videostab/src/inpainting.cpp
+3
-0
No files found.
modules/core/include/opencv2/core/mat.hpp
View file @
acfdd0e1
...
...
@@ -183,7 +183,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
>
>&
)
;
_InputArray
(
const
std
::
vector
<
std
::
vector
<
bool
>
>&
)
=
delete
;
// not supported
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
);
...
...
@@ -302,9 +302,9 @@ public:
_OutputArray
(
cuda
::
HostMem
&
cuda_mem
);
template
<
typename
_Tp
>
_OutputArray
(
cudev
::
GpuMat_
<
_Tp
>&
m
);
template
<
typename
_Tp
>
_OutputArray
(
std
::
vector
<
_Tp
>&
vec
);
_OutputArray
(
std
::
vector
<
bool
>&
vec
)
;
_OutputArray
(
std
::
vector
<
bool
>&
vec
)
=
delete
;
// not supported
template
<
typename
_Tp
>
_OutputArray
(
std
::
vector
<
std
::
vector
<
_Tp
>
>&
vec
);
_OutputArray
(
std
::
vector
<
std
::
vector
<
bool
>
>&
)
;
_OutputArray
(
std
::
vector
<
std
::
vector
<
bool
>
>&
)
=
delete
;
// not supported
template
<
typename
_Tp
>
_OutputArray
(
std
::
vector
<
Mat_
<
_Tp
>
>&
vec
);
template
<
typename
_Tp
>
_OutputArray
(
Mat_
<
_Tp
>&
m
);
template
<
typename
_Tp
>
_OutputArray
(
_Tp
*
vec
,
int
n
);
...
...
@@ -372,7 +372,7 @@ public:
_InputOutputArray
(
cuda
::
HostMem
&
cuda_mem
);
template
<
typename
_Tp
>
_InputOutputArray
(
cudev
::
GpuMat_
<
_Tp
>&
m
);
template
<
typename
_Tp
>
_InputOutputArray
(
std
::
vector
<
_Tp
>&
vec
);
_InputOutputArray
(
std
::
vector
<
bool
>&
vec
)
;
_InputOutputArray
(
std
::
vector
<
bool
>&
vec
)
=
delete
;
// not supported
template
<
typename
_Tp
>
_InputOutputArray
(
std
::
vector
<
std
::
vector
<
_Tp
>
>&
vec
);
template
<
typename
_Tp
>
_InputOutputArray
(
std
::
vector
<
Mat_
<
_Tp
>
>&
vec
);
template
<
typename
_Tp
>
_InputOutputArray
(
Mat_
<
_Tp
>&
m
);
...
...
modules/core/include/opencv2/core/mat.inl.hpp
View file @
acfdd0e1
...
...
@@ -100,10 +100,6 @@ template<typename _Tp> inline
_InputArray
::
_InputArray
(
const
std
::
vector
<
std
::
vector
<
_Tp
>
>&
vec
)
{
init
(
FIXED_TYPE
+
STD_VECTOR_VECTOR
+
traits
::
Type
<
_Tp
>::
value
+
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
+
traits
::
Type
<
_Tp
>::
value
+
ACCESS_READ
,
&
vec
);
}
...
...
@@ -179,18 +175,10 @@ template<std::size_t _Nm> inline
_OutputArray
::
_OutputArray
(
std
::
array
<
Mat
,
_Nm
>&
arr
)
{
init
(
STD_ARRAY_MAT
+
ACCESS_WRITE
,
arr
.
data
(),
Size
(
1
,
_Nm
));
}
inline
_OutputArray
::
_OutputArray
(
std
::
vector
<
bool
>&
)
{
CV_Error
(
Error
::
StsUnsupportedFormat
,
"std::vector<bool> cannot be an output array
\n
"
);
}
template
<
typename
_Tp
>
inline
_OutputArray
::
_OutputArray
(
std
::
vector
<
std
::
vector
<
_Tp
>
>&
vec
)
{
init
(
FIXED_TYPE
+
STD_VECTOR_VECTOR
+
traits
::
Type
<
_Tp
>::
value
+
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
+
traits
::
Type
<
_Tp
>::
value
+
ACCESS_WRITE
,
&
vec
);
}
...
...
@@ -294,9 +282,6 @@ template<std::size_t _Nm> inline
_InputOutputArray
::
_InputOutputArray
(
std
::
array
<
Mat
,
_Nm
>&
arr
)
{
init
(
STD_ARRAY_MAT
+
ACCESS_RW
,
arr
.
data
(),
Size
(
1
,
_Nm
));
}
inline
_InputOutputArray
::
_InputOutputArray
(
std
::
vector
<
bool
>&
)
{
CV_Error
(
Error
::
StsUnsupportedFormat
,
"std::vector<bool> cannot be an input/output array
\n
"
);
}
template
<
typename
_Tp
>
inline
_InputOutputArray
::
_InputOutputArray
(
std
::
vector
<
std
::
vector
<
_Tp
>
>&
vec
)
{
init
(
FIXED_TYPE
+
STD_VECTOR_VECTOR
+
traits
::
Type
<
_Tp
>::
value
+
ACCESS_RW
,
&
vec
);
}
...
...
modules/videostab/src/inpainting.cpp
View file @
acfdd0e1
...
...
@@ -325,6 +325,9 @@ public:
};
#ifdef _MSC_VER
#pragma warning(disable: 4702) // unreachable code
#endif
MotionInpainter
::
MotionInpainter
()
{
#ifdef HAVE_OPENCV_CUDAOPTFLOW
...
...
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