Merge branch 'master' of https://github.com/AlexeyAB/darknet into Fix_get_c...

IlyaOvodov

2018-06-04 f0abcfa02b2094396f955c743f7f11fcdb2e3d13

 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
@@ -283,6 +283,8 @@

   // HSV augmentation
   // CV_BGR2HSV, CV_RGB2HSV, CV_HSV2BGR, CV_HSV2RGB
   if (ipl->nChannels >= 3)
   {
   cv::Mat hsv_src;
   cvtColor(sized, hsv_src, CV_BGR2HSV);  // also BGR -> RGB
   
@@ -296,6 +298,11 @@
   cv::merge(hsv, hsv_src);

   cvtColor(hsv_src, sized, CV_HSV2RGB);  // now RGB instead of BGR
   }
   else
   {
      sized *= dexp;
   }

   // Mat -> IplImage -> image
   IplImage src = sized;