Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv_contrib
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_contrib
Commits
0e7405ce
Commit
0e7405ce
authored
Aug 31, 2016
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed several GCC warnings
parent
4886ca64
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
15 deletions
+7
-15
zoomableimage.cpp
modules/cvv/src/qtutil/zoomableimage.cpp
+2
-2
test_location.cpp
modules/cvv/test/test_location.cpp
+1
-1
test_main.cpp
modules/cvv/test/test_main.cpp
+1
-1
cnpy.h
modules/dnn/test/cnpy.h
+1
-1
test_layers.cpp
modules/dnn/test/test_layers.cpp
+2
-2
l0_smooth.cpp
modules/ximgproc/src/l0_smooth.cpp
+0
-8
No files found.
modules/cvv/src/qtutil/zoomableimage.cpp
View file @
0e7405ce
...
...
@@ -64,8 +64,8 @@ template <int depth, int channels>
std
::
string
printPixel
(
const
cv
::
Mat
&
mat
,
int
spalte
,
int
zeile
)
{
std
::
stringstream
ss
{};
auto
p
=
mat
.
at
<
cv
::
Vec
<
cvv
::
qtutil
::
DepthType
<
depth
>
,
channels
>>
(
zeile
,
spalte
);
typedef
cv
::
Vec
<
cvv
::
qtutil
::
DepthType
<
depth
>
,
channels
>
VecType
;
const
VecType
&
p
=
mat
.
at
<
VecType
>
(
zeile
,
spalte
);
putInStream
<
depth
>
(
ss
,
p
[
0
]);
for
(
int
c
=
1
;
c
<
mat
.
channels
();
c
++
)
...
...
modules/cvv/test/test_location.cpp
View file @
0e7405ce
...
...
@@ -10,7 +10,7 @@
TEST
(
LocationTest
,
FileLineFunction
)
{
auto
locationMacroResult
=
CVVISUAL_LOCATION
;
auto
line
=
__LINE__
-
1
;
size_t
line
=
__LINE__
-
1
;
auto
file
=
__FILE__
;
auto
fun
=
CVVISUAL_FUNCTION_NAME_MACRO
;
EXPECT_EQ
(
locationMacroResult
.
isKnown
,
true
);
...
...
modules/cvv/test/test_main.cpp
View file @
0e7405ce
#include "test_precomp.hpp"
CV_TEST_MAIN
(
"."
)
CV_TEST_MAIN
(
"."
,
/*Empty VA_ARGS for C++11*/
)
modules/dnn/test/cnpy.h
View file @
0e7405ce
...
...
@@ -95,7 +95,7 @@ namespace cnpy {
template
<
typename
T
>
std
::
vector
<
char
>&
operator
+=
(
std
::
vector
<
char
>&
lhs
,
const
T
rhs
)
{
//write in little endian
for
(
char
byte
=
0
;
byte
<
sizeof
(
T
);
byte
++
)
{
for
(
char
byte
=
0
;
(
size_t
)
byte
<
sizeof
(
T
);
byte
++
)
{
char
val
=
*
((
char
*
)
&
rhs
+
byte
);
lhs
.
push_back
(
val
);
}
...
...
modules/dnn/test/test_layers.cpp
View file @
0e7405ce
...
...
@@ -306,7 +306,7 @@ TEST_F(Layer_LSTM_Test, get_set_test)
inputs
.
push_back
(
Blob
(
inpResShape
));
runLayer
(
layer
,
inputs
,
outputs
);
EXPECT_EQ
(
2
,
outputs
.
size
());
EXPECT_EQ
(
2
u
,
outputs
.
size
());
EXPECT_EQ
(
outResShape
,
outputs
[
0
].
shape
());
EXPECT_EQ
(
outResShape
,
outputs
[
1
].
shape
());
...
...
@@ -388,7 +388,7 @@ TEST_F(Layer_RNN_Test, get_set_test)
inputs
.
push_back
(
Blob
(
BlobShape
(
nT
,
nS
,
1
,
nX
)));
runLayer
(
layer
,
inputs
,
outputs
);
EXPECT_EQ
(
outputs
.
size
(),
2
);
EXPECT_EQ
(
outputs
.
size
(),
2
u
);
EXPECT_EQ
(
outputs
[
0
].
shape
(),
BlobShape
(
nT
,
nS
,
nO
));
EXPECT_EQ
(
outputs
[
1
].
shape
(),
BlobShape
(
nT
,
nS
,
nH
));
}
...
...
modules/ximgproc/src/l0_smooth.cpp
View file @
0e7405ce
...
...
@@ -212,14 +212,6 @@ namespace
D
.
copyTo
(
dst
);
}
void
addComplex
(
InputArray
aSrc
,
int
bSrc
,
OutputArray
dst
)
{
Mat
panels
[
2
];
split
(
aSrc
.
getMat
(),
panels
);
panels
[
0
]
=
panels
[
0
]
+
bSrc
;
merge
(
panels
,
2
,
dst
);
}
void
divComplexByRealMultiChannel
(
vector
<
Mat
>
&
numer
,
vector
<
Mat
>
&
denom
,
vector
<
Mat
>
&
dst
)
{
...
...
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