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

Fixed unused tracking for OpenCV 2.x

Browse Source
This commit is contained in:
AlexeyAB
2018-01-11 16:11:16 +03:00
parent ea09a6e0b3
commit 5424987dd1
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/yolo_console_dll.cpp
View File

@ -13,6 +13,7 @@
#define OPENCV #define OPENCV
#endif #endif
// To use tracking - uncomment the following line. Tracking is supported only by OpenCV 3.x
//#define TRACK_OPTFLOW //#define TRACK_OPTFLOW
#include "yolo_v2_class.hpp" // imported functions from DLL #include "yolo_v2_class.hpp" // imported functions from DLL
@ -107,7 +108,7 @@ int main(int argc, char *argv[])
auto obj_names = objects_names_from_file(names_file); auto obj_names = objects_names_from_file(names_file);
std::string out_videofile = "result.avi"; std::string out_videofile = "result.avi";
bool const save_output_videofile = true; bool const save_output_videofile = false;
#ifdef TRACK_OPTFLOW #ifdef TRACK_OPTFLOW
Tracker_optflow tracker_flow; Tracker_optflow tracker_flow;
detector.wait_stream = true; detector.wait_stream = true;

10
src/yolo_v2_class.hpp
View File

@ -8,11 +8,6 @@
#include <opencv2/opencv.hpp> // C++ #include <opencv2/opencv.hpp> // C++
#include "opencv2/highgui/highgui_c.h" // C #include "opencv2/highgui/highgui_c.h" // C
#include "opencv2/imgproc/imgproc_c.h" // C #include "opencv2/imgproc/imgproc_c.h" // C
#include <opencv2/cudaoptflow.hpp>
#include <opencv2/cudaimgproc.hpp>
#include <opencv2/cudaarithm.hpp>
#include <opencv2/core/cuda.hpp>
#endif // OPENCV #endif // OPENCV
#ifdef YOLODLL_EXPORTS #ifdef YOLODLL_EXPORTS
@ -149,6 +144,11 @@ private:
#if defined(TRACK_OPTFLOW) && defined(OPENCV) #if defined(TRACK_OPTFLOW) && defined(OPENCV)
#include <opencv2/cudaoptflow.hpp>
#include <opencv2/cudaimgproc.hpp>
#include <opencv2/cudaarithm.hpp>
#include <opencv2/core/cuda.hpp>
class Tracker_optflow { class Tracker_optflow {
public: public:
const int gpu_count; const int gpu_count;