diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-03-15 00:05:41 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-03-15 00:05:41 +0000 |
| commit | 61ca28696f78738e972336d1d65026527cef5795 (patch) | |
| tree | 37effd6d27b27708128eb7ef217b67ed1ef7ca95 /ext/opencv/gsttemplatematch.h | |
| parent | 25d92711bc5161223e95c5478696879161f0cf7e (diff) | |
| download | gstreamer-plugins-bad-61ca28696f78738e972336d1d65026527cef5795.tar.gz | |
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.
Diffstat (limited to 'ext/opencv/gsttemplatematch.h')
| -rw-r--r-- | ext/opencv/gsttemplatematch.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/opencv/gsttemplatematch.h b/ext/opencv/gsttemplatematch.h index 7b4b38852..7e55ac6cf 100644 --- a/ext/opencv/gsttemplatematch.h +++ b/ext/opencv/gsttemplatematch.h @@ -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 */ |