mirror/darknet
1
0
Fork 0
mirror of https://github.com/pjreddie/darknet.git synced 2023-08-10 21:13:14 +03:00
Code Issues Projects Releases Wiki Activity

Another fix for old and new OpenCV

Browse Source
This commit is contained in:
AlexeyAB
2019-04-08 19:32:27 +03:00
parent 199b88624e
commit 5a094da200
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/image_opencv.cpp
View File

@ -18,12 +18,22 @@
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>
#include <opencv2/video/video.hpp> #include <opencv2/video/video.hpp>
// includes for OpenCV >= 3.x
#ifndef CV_VERSION_EPOCH #ifndef CV_VERSION_EPOCH
#include <opencv2/core/types.hpp> #include <opencv2/core/types.hpp>
#include <opencv2/videoio/videoio.hpp> #include <opencv2/videoio/videoio.hpp>
#include <opencv2/imgcodecs/imgcodecs.hpp> #include <opencv2/imgcodecs/imgcodecs.hpp>
#endif #endif
// OpenCV includes for OpenCV 2.x
#ifdef CV_VERSION_EPOCH
#include <opencv2/highgui/highgui_c.h>
#include <opencv2/imgproc/imgproc_c.h>
#include <opencv2/core/types_c.h>
#include <opencv2/core/version.hpp>
#endif
using namespace cv; using namespace cv;
using std::cerr; using std::cerr;
@ -44,15 +54,7 @@ using std::endl;
#endif // USE_CMAKE_LIBS #endif // USE_CMAKE_LIBS
#endif // CV_VERSION_EPOCH #endif // CV_VERSION_EPOCH
// OpenCV includes
#include <opencv2/highgui/highgui_c.h>
#include <opencv2/imgproc/imgproc_c.h>
#include <opencv2/core/types_c.h>
#include <opencv2/core/version.hpp>
#ifndef CV_VERSION_EPOCH
//#include <opencv2/videoio/videoio_c.h>
//#include <opencv2/imgcodecs/imgcodecs_c.h>
#endif
#include "http_stream.h" #include "http_stream.h"
@ -447,7 +449,11 @@ write_cv *create_video_writer(char *out_filename, char c1, char c2, char c3, cha
{ {
try { try {
cv::VideoWriter * output_video_writer = cv::VideoWriter * output_video_writer =
#ifdef CV_VERSION_EPOCH
new cv::VideoWriter(out_filename, CV_FOURCC(c1, c2, c3, c4), fps, cv::Size(width, height), is_color); new cv::VideoWriter(out_filename, CV_FOURCC(c1, c2, c3, c4), fps, cv::Size(width, height), is_color);
#else
new cv::VideoWriter(out_filename, cv::VideoWriter::fourcc(c1, c2, c3, c4), fps, cv::Size(width, height), is_color);
#endif
return (write_cv *)output_video_writer; return (write_cv *)output_video_writer;
} }