mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 17:20:36 +00:00
opencv: make build with opencv 2.3.1 as in debian sid
Where highgui.h doesn't exist any more, but only opencv2/highgui/highgui.hpp. Also, not quite sure why we're checking for cvaux.h, it's not used anywhere.
This commit is contained in:
parent
25d92711bc
commit
61ca28696f
3 changed files with 10 additions and 6 deletions
|
@ -1432,16 +1432,12 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv, [
|
|||
AC_LANG_CPLUSPLUS
|
||||
OLD_CPPFLAGS=$CPPFLAGS
|
||||
CPPFLAGS=$OPENCV_CFLAGS
|
||||
AC_CHECK_HEADER(highgui.h, HAVE_HIGHGUI="yes", HAVE_HIGHGUI="no")
|
||||
AC_CHECK_HEADER(cvaux.h, HAVE_CVAUX="yes", HAVE_CVAUX="no")
|
||||
AC_CHECK_HEADERS(highgui.h opencv2/highgui/highgui.hpp, HAVE_HIGHGUI="yes", HAVE_HIGHGUI="no")
|
||||
CPPFLAGS=$OLD_CPPFLAGS
|
||||
AC_LANG_C
|
||||
if test "x$HAVE_HIGHGUI" = "xno"; then
|
||||
AC_MSG_RESULT(highgui.h could not be found.)
|
||||
HAVE_OPENCV="no"
|
||||
elif test "x$HAVE_CVAUX" = "xno"; then
|
||||
AC_MSG_RESULT(cvaux.h could not be found.)
|
||||
HAVE_OPENCV="no"
|
||||
else
|
||||
HAVE_OPENCV="yes"
|
||||
fi
|
||||
|
|
|
@ -46,7 +46,11 @@
|
|||
#define MOTIONCELLS_H_
|
||||
|
||||
#include <cv.h> // includes OpenCV definitions
|
||||
#ifndef __OPENCV_OLD_CV_H__
|
||||
#include <highgui.h> // includes highGUI definitions
|
||||
#else
|
||||
#include <opencv2/highgui/highgui.hpp> // includes highGUI definitions
|
||||
#endif
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include <vector>
|
||||
|
|
|
@ -48,7 +48,11 @@
|
|||
|
||||
#include <gst/gst.h>
|
||||
#include <cv.h>
|
||||
#include <highgui.h>
|
||||
#ifndef __OPENCV_OLD_CV_H__
|
||||
#include <highgui.h> // includes highGUI definitions
|
||||
#else
|
||||
#include <opencv2/highgui/highgui.hpp> // includes highGUI definitions
|
||||
#endif
|
||||
|
||||
G_BEGIN_DECLS
|
||||
/* #defines don't like whitespacey bits */
|
||||
|
|
Loading…
Reference in a new issue