From d8b59fcafe2e8bab35358deeb50627b10c2f2710 Mon Sep 17 00:00:00 2001
From: Howard Stark <howard@getcoffee.io>
Date: Mon, 19 Feb 2018 22:26:53 +0000
Subject: [PATCH] Changed definition location to adhere to compatability promises
---
src/yolo_v2_class.cpp | 12 ------------
src/yolo_v2_class.hpp | 9 ++++++++-
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/yolo_v2_class.cpp b/src/yolo_v2_class.cpp
index 1a5ccac..8ef5e93 100644
--- a/src/yolo_v2_class.cpp
+++ b/src/yolo_v2_class.cpp
@@ -33,18 +33,6 @@
unsigned int *track_id;
};
-#ifdef OPENCV
-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 offset = obj_id * 123457 % 6;
- int const color_scale = 150 + (obj_id * 123457) % 100;
- cv::Scalar color(colors[offset][0], colors[offset][1], colors[offset][2]);
- color *= color_scale;
- return color;
-}
-#endif
-
YOLODLL_API Detector::Detector(std::string cfg_filename, std::string weight_filename, int gpu_id) : cur_gpu_id(gpu_id)
{
wait_stream = 0;
diff --git a/src/yolo_v2_class.hpp b/src/yolo_v2_class.hpp
index f93abaa..4e27b00 100644
--- a/src/yolo_v2_class.hpp
+++ b/src/yolo_v2_class.hpp
@@ -453,7 +453,14 @@
#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 offset = obj_id * 123457 % 6;
+ int const color_scale = 150 + (obj_id * 123457) % 100;
+ cv::Scalar color(colors[offset][0], colors[offset][1], colors[offset][2]);
+ color *= color_scale;
+ return color;
+}
class preview_boxes_t {
enum { frames_history = 30 }; // how long to keep the history saved
--
Gitblit v1.10.0