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
b16d9dbc
Commit
b16d9dbc
authored
Nov 17, 2017
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed several warnings produced by GCC 7
parent
6f07e2fc
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
20 additions
and
16 deletions
+20
-16
retinaDemo.cpp
modules/bioinspired/samples/retinaDemo.cpp
+5
-3
omni_stereo_calibration.cpp
modules/ccalib/samples/omni_stereo_calibration.cpp
+5
-6
track_vot.cpp
modules/datasets/src/track_vot.cpp
+1
-1
test_projection.cpp
modules/sfm/test/test_projection.cpp
+6
-0
textdetection.cpp
modules/text/samples/textdetection.cpp
+1
-1
tldDetector.cpp
modules/tracking/src/tldDetector.cpp
+0
-2
tldDetector.hpp
modules/tracking/src/tldDetector.hpp
+0
-1
test_adaptive_manifold.cpp
modules/ximgproc/test/test_adaptive_manifold.cpp
+2
-2
No files found.
modules/bioinspired/samples/retinaDemo.cpp
View file @
b16d9dbc
...
...
@@ -53,11 +53,13 @@ int main(int argc, char* argv[])
bool
useOCL
=
parser
.
has
(
"ocl"
);
cv
::
ocl
::
setUseOpenCL
(
useOCL
);
if
(
useOCL
&&
!
cv
::
ocl
::
useOpenCL
())
{
std
::
cout
<<
"Failed to enable OpenCL
\n
"
;
}
// declare the retina input buffer... that will be fed differently in regard of the input media
cv
::
Mat
inputFrame
;
cv
::
VideoCapture
videoCapture
;
// in case a video media is used, its manager is declared here
// declare the retina input buffer... that will be fed differently in regard of the input media
cv
::
Mat
inputFrame
;
cv
::
VideoCapture
videoCapture
;
// in case a video media is used, its manager is declared here
if
(
parser
.
has
(
"video"
))
videoCapture
.
open
(
parser
.
get
<
cv
::
String
>
(
"video"
));
...
...
modules/ccalib/samples/omni_stereo_calibration.cpp
View file @
b16d9dbc
...
...
@@ -83,10 +83,10 @@ static bool detecChessboardCorners(const vector<string>& list1, vector<string>&
}
if
(
!
img_l
.
empty
())
imageSize1
=
img_l
.
size
();
if
(
!
img_r
.
empty
())
{
imageSize2
=
img_r
.
size
();
}
if
(
!
img_r
.
empty
())
{
imageSize2
=
img_r
.
size
();
}
if
(
image_points_1
.
size
()
<
3
)
return
false
;
...
...
@@ -314,4 +314,4 @@ int main(int argc, char** argv)
saveCameraParams
(
outputFilename
,
flags
,
K1
,
K2
,
D1
,
D2
,
_xi1
,
_xi2
,
rvec
,
tvec
,
rvecs
,
tvecs
,
detec_list_1
,
detec_list_2
,
idx
,
rms
,
imagePoints1
,
imagePoints2
);
}
\ No newline at end of file
}
modules/datasets/src/track_vot.cpp
View file @
b16d9dbc
...
...
@@ -91,7 +91,7 @@ namespace cv
string
TRACK_votImpl
::
numberToString
(
int
number
)
{
string
out
;
char
numberStr
[
9
];
char
numberStr
[
20
];
sprintf
(
numberStr
,
"%u"
,
number
);
for
(
unsigned
int
i
=
0
;
i
<
8
-
strlen
(
numberStr
);
++
i
)
{
...
...
modules/sfm/test/test_projection.cpp
View file @
b16d9dbc
...
...
@@ -53,9 +53,15 @@ TEST(Sfm_projection, homogeneousToEuclidean)
EXPECT_EQ
((
int
)
X
.
rows
-
1
,(
int
)
XEuclidean
.
rows
);
for
(
int
y
=
0
;
y
<
X
.
rows
-
1
;
++
y
)
{
for
(
int
x
=
0
;
x
<
X
.
cols
;
++
x
)
{
if
(
X
(
X
.
rows
-
1
,
x
)
!=
0
)
{
EXPECT_LE
(
std
::
abs
(
X
(
y
,
x
)
/
X
(
X
.
rows
-
1
,
x
)
-
XEuclidean
(
y
,
x
)),
1e-4
);
}
}
}
}
TEST
(
Sfm_projection
,
euclideanToHomogeneous
)
...
...
modules/text/samples/textdetection.cpp
View file @
b16d9dbc
...
...
@@ -119,7 +119,7 @@ void er_show(vector<Mat> &channels, vector<vector<ERStat> > ®ions)
Scalar
(
255
),
0
,
Scalar
(
er
.
level
),
Scalar
(
0
),
flags
);
}
}
char
buff
[
1
0
];
char
*
buff_ptr
=
buff
;
char
buff
[
2
0
];
char
*
buff_ptr
=
buff
;
sprintf
(
buff
,
"channel %d"
,
c
);
imshow
(
buff_ptr
,
dst
);
}
...
...
modules/tracking/src/tldDetector.cpp
View file @
b16d9dbc
...
...
@@ -440,8 +440,6 @@ namespace cv
LabeledPatch
labPatch
;
double
curScale
=
pow
(
SCALE_STEP
,
ensScaleIDs
[
i
]);
labPatch
.
rect
=
Rect2d
(
ensBuffer
[
i
].
x
*
curScale
,
ensBuffer
[
i
].
y
*
curScale
,
initSize
.
width
*
curScale
,
initSize
.
height
*
curScale
);
labPatch
.
Sc
=
scValues
[
i
];
//printf("max sc %f\n", labPatch.Sc);
const
double
srValue
=
srValues
[
i
];
const
double
scValue
=
scValues
[
i
];
...
...
modules/tracking/src/tldDetector.hpp
View file @
b16d9dbc
...
...
@@ -103,7 +103,6 @@ namespace cv
{
Rect2d
rect
;
bool
isObject
,
shouldBeIntegrated
;
double
Sc
;
};
bool
detect
(
const
Mat
&
img
,
const
Mat
&
imgBlurred
,
Rect2d
&
res
,
std
::
vector
<
LabeledPatch
>&
patches
,
Size
initSize
);
bool
ocl_detect
(
const
Mat
&
img
,
const
Mat
&
imgBlurred
,
Rect2d
&
res
,
std
::
vector
<
LabeledPatch
>&
patches
,
Size
initSize
);
...
...
modules/ximgproc/test/test_adaptive_manifold.cpp
View file @
b16d9dbc
...
...
@@ -59,8 +59,8 @@ static void checkSimilarity(InputArray res, InputArray ref, double maxNormInf =
double
normInf
=
cvtest
::
norm
(
res
,
ref
,
NORM_INF
);
double
normL2
=
cvtest
::
norm
(
res
,
ref
,
NORM_L2
)
/
res
.
total
();
if
(
maxNormInf
>=
0
)
EXPECT_LE
(
normInf
,
maxNormInf
);
if
(
maxNormL2
>=
0
)
EXPECT_LE
(
normL2
,
maxNormL2
);
if
(
maxNormInf
>=
0
)
{
EXPECT_LE
(
normInf
,
maxNormInf
);
}
if
(
maxNormL2
>=
0
)
{
EXPECT_LE
(
normL2
,
maxNormL2
);
}
}
TEST
(
AdaptiveManifoldTest
,
SplatSurfaceAccuracy
)
...
...
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