Compile fixes

pull/398/head
AlexeyAB 7 years ago
parent be90b8e8cb
commit cd8a3dcb4c
  1. 2
      src/yolo_console_dll.cpp
  2. 9
      src/yolo_v2_class.hpp

@ -14,7 +14,7 @@
#endif #endif
// To use tracking - uncomment the following line. Tracking is supported only by OpenCV 3.x // 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

@ -144,8 +144,8 @@ private:
}; };
#ifdef OPENCV
#ifdef TRACK_OPTFLOW #if defined(TRACK_OPTFLOW) && defined(OPENCV)
#include <opencv2/cudaoptflow.hpp> #include <opencv2/cudaoptflow.hpp>
#include <opencv2/cudaimgproc.hpp> #include <opencv2/cudaimgproc.hpp>
@ -324,9 +324,11 @@ public:
class Tracker_optflow {}; class Tracker_optflow {};
#endif // TRACK_OPTFLOW #endif // defined(TRACK_OPTFLOW) && defined(OPENCV)
#ifdef OPENCV
cv::Scalar obj_id_to_color(int obj_id) { cv::Scalar obj_id_to_color(int obj_id) {
int const colors[6][3] = { { 1,0,1 },{ 0,0,1 },{ 0,1,1 },{ 0,1,0 },{ 1,1,0 },{ 1,0,0 } }; int const colors[6][3] = { { 1,0,1 },{ 0,0,1 },{ 0,1,1 },{ 0,1,0 },{ 1,1,0 },{ 1,0,0 } };
int const offset = obj_id * 123457 % 6; int const offset = obj_id * 123457 % 6;
@ -469,4 +471,3 @@ public:
} }
}; };
#endif // OPENCV #endif // OPENCV

Loading…
Cancel
Save