From 815e7a127b062aa8bc4f4ba7af2cfd97c232f34c Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 02 Aug 2017 21:48:29 +0000
Subject: [PATCH] Supported OpenCV 3.0 and 2.4.13. Supported Windows and Linux.

---
 src/demo.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/demo.c b/src/demo.c
index 3aec3a5..49e08c2 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -7,16 +7,23 @@
 #include "box.h"
 #include "image.h"
 #include "demo.h"
-//#include <sys/time.h>
+#ifdef WIN32
 #include <time.h>
 #include <winsock.h>
 #include "gettimeofday.h"
+#else
+#include <sys/time.h>
+#endif
 
 #define FRAMES 3
 
 #ifdef OPENCV
 #include "opencv2/highgui/highgui_c.h"
 #include "opencv2/imgproc/imgproc_c.h"
+#include "opencv2/core/version.hpp"
+#ifndef CV_VERSION_EPOCH
+#include "opencv2/videoio/videoio_c.h"
+#endif
 image get_image_from_stream(CvCapture *cap);
 
 static char **demo_names;

--
Gitblit v1.10.0