From f0abcfa02b2094396f955c743f7f11fcdb2e3d13 Mon Sep 17 00:00:00 2001
From: IlyaOvodov <b@ovdv.ru>
Date: Mon, 04 Jun 2018 15:57:15 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/AlexeyAB/darknet into Fix_get_color_depth

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

diff --git a/src/voxel.c b/src/voxel.c
index c277bcf..476663f 100644
--- a/src/voxel.c
+++ b/src/voxel.c
@@ -5,6 +5,11 @@
 
 #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
 
 void extract_voxel(char *lfile, char *rfile, char *prefix)

--
Gitblit v1.10.0