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/http_stream.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/http_stream.cpp b/src/http_stream.cpp
index acb6c8e..1b65173 100644
--- a/src/http_stream.cpp
+++ b/src/http_stream.cpp
@@ -44,7 +44,7 @@
 using std::endl;
 
 #include "opencv2/opencv.hpp"
-#include "opencv2/highgui.hpp"
+#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/highgui/highgui_c.h"
 #include "opencv2/imgproc/imgproc_c.h"
 #ifndef CV_VERSION_EPOCH
@@ -312,4 +312,4 @@
 }
 
 
-#endif	// OPENCV
\ No newline at end of file
+#endif	// OPENCV

--
Gitblit v1.10.0