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/classifier.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/classifier.c b/src/classifier.c index fbfe5e7..5e718c5 100644 --- a/src/classifier.c +++ b/src/classifier.c @@ -6,13 +6,20 @@ #include "assert.h" #include "classifier.h" #include "cuda.h" -//#include <sys/time.h> +#ifdef WIN32 #include <time.h> #include <winsock.h> #include "gettimeofday.h" +#else +#include <sys/time.h> +#endif #ifdef OPENCV #include "opencv2/highgui/highgui_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); #endif -- Gitblit v1.10.0