Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Philippe Normand
gst-plugins-bad
Commits
24d5c9b2
Commit
24d5c9b2
authored
Nov 25, 2018
by
Nicola Murino
Committed by
Nicolas Dufresne
Nov 26, 2018
Browse files
opencv: define CASCADE_DO_CANNY_PRUNING for opencv < 4
parent
b0773c6e
Changes
1
Hide whitespace changes
Inline
Side-by-side
ext/opencv/gsthanddetect.cpp
View file @
24d5c9b2
...
...
@@ -69,6 +69,9 @@
GST_DEBUG_CATEGORY_STATIC
(
gst_handdetect_debug
);
#define GST_CAT_DEFAULT gst_handdetect_debug
#if (CV_MAJOR_VERSION < 4)
#define CASCADE_DO_CANNY_PRUNING CV_HAAR_DO_CANNY_PRUNING
#endif
/* define HAAR files */
#define HAAR_FILE_FIST GST_HAAR_CASCADES_DIR G_DIR_SEPARATOR_S "fist.xml"
...
...
@@ -413,13 +416,8 @@ gst_handdetect_transform_ip (GstOpencvVideoFilter * transform,
Mat
roi
(
image
,
Rect
(
filter
->
cvGray
->
origin
,
filter
->
cvGray
->
origin
,
filter
->
cvGray
->
width
,
filter
->
cvGray
->
height
));
#if (CV_MAJOR_VERSION >= 4)
filter
->
cvCascade_fist
->
detectMultiScale
(
roi
,
hands
,
1.1
,
2
,
CASCADE_DO_CANNY_PRUNING
,
cvSize
(
24
,
24
),
cvSize
(
0
,
0
));
#else
filter
->
cvCascade_fist
->
detectMultiScale
(
roi
,
hands
,
1.1
,
2
,
CV_HAAR_DO_CANNY_PRUNING
,
cvSize
(
24
,
24
),
cvSize
(
0
,
0
));
#endif
/* if FIST gesture detected */
if
(
!
hands
.
empty
())
{
...
...
Write
Preview
Supports
Markdown
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