diff options
| author | Luis de Bethencourt <luisbg@osg.samsung.com> | 2015-10-02 16:01:29 +0100 |
|---|---|---|
| committer | Luis de Bethencourt <luisbg@osg.samsung.com> | 2015-10-02 17:10:59 +0100 |
| commit | dab249a4453f86c7cf671da0ba10ff0b8bcc5531 (patch) | |
| tree | ed2a2149b127657e9d590021f2683f0e8287e95c /ext | |
| parent | b58f7115665532fd0676baa151fd85ffe3c8bdd3 (diff) | |
| download | gstreamer-plugins-bad-dab249a4453f86c7cf671da0ba10ff0b8bcc5531.tar.gz | |
handdetect: Change gsthanddetect to C++
Change the gsthanddetect.c file to cpp and add it into Makefile.
It is necessary to migrate the handdetect plugin to C++,
in order to load new and old classifiers, to make handdetect work
with newer versions of Opencv.
https://bugzilla.gnome.org/show_bug.cgi?id=752528
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/opencv/Makefile.am | 6 | ||||
| -rw-r--r-- | ext/opencv/gsthanddetect.cpp (renamed from ext/opencv/gsthanddetect.c) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/opencv/Makefile.am b/ext/opencv/Makefile.am index 72472fbe9..140d0449f 100644 --- a/ext/opencv/Makefile.am +++ b/ext/opencv/Makefile.am @@ -13,7 +13,7 @@ libgstopencv_la_SOURCES = gstopencv.cpp \ gstcvsobel.c \ gstedgedetect.cpp \ gstfaceblur.cpp \ - gsthanddetect.c \ + gsthanddetect.cpp \ gstpyramidsegment.c \ gsttemplatematch.c \ gsttextoverlay.c \ @@ -27,7 +27,8 @@ libgstopencv_la_SOURCES = gstopencv.cpp \ motioncells_wrapper.cpp \ MotionCells.cpp -libgstopencv_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(OPENCV_CFLAGS) +libgstopencv_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(OPENCV_CFLAGS) \ + -DGST_HAAR_CASCADES_DIR=\"$(pkgdatadir)/@GST_API_VERSION@/opencv_haarcascades\" # flags used to compile this facedetect # add other _CFLAGS and _LIBS as needed @@ -36,7 +37,6 @@ libgstopencv_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_C # OpenCV's define isn't good enough to avoid 'unused' gcc warnings (at v2.1.0) libgstopencv_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) $(OPENCV_CFLAGS) \ - -DGST_HAAR_CASCADES_DIR=\"$(pkgdatadir)/@GST_API_VERSION@/opencv_haarcascades\" \ -DCV_INLINE="static inline" \ -DCV_NO_BACKWARD_COMPATIBILITY diff --git a/ext/opencv/gsthanddetect.c b/ext/opencv/gsthanddetect.cpp index 86fb88193..86fb88193 100644 --- a/ext/opencv/gsthanddetect.c +++ b/ext/opencv/gsthanddetect.cpp |