From eb46166f1130d6c6fb5d41d6090a86b35d1542fc Mon Sep 17 00:00:00 2001
From: Edmond Yoo <hj3yoo@uwaterloo.ca>
Date: Thu, 06 Sep 2018 17:31:12 +0000
Subject: [PATCH] merge resolution

---
 src/art.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/art.c b/src/art.c
index 71d3719..2a28370 100644
--- a/src/art.c
+++ b/src/art.c
@@ -4,10 +4,21 @@
 #include "option_list.h"
 #include "blas.h"
 #include "classifier.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