From 160eddddc4e265d5ee59a38797c30720bf46cd7c Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Sun, 27 May 2018 13:53:42 +0000
Subject: [PATCH] Minor fix
---
src/box.h | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/box.h b/src/box.h
index c023e20..6063a48 100644
--- a/src/box.h
+++ b/src/box.h
@@ -1,6 +1,20 @@
#ifndef BOX_H
#define BOX_H
+#ifdef YOLODLL_EXPORTS
+#if defined(_MSC_VER)
+#define YOLODLL_API __declspec(dllexport)
+#else
+#define YOLODLL_API __attribute__((visibility("default")))
+#endif
+#else
+#if defined(_MSC_VER)
+#define YOLODLL_API
+#else
+#define YOLODLL_API
+#endif
+#endif
+
typedef struct{
float x, y, w, h;
} box;
@@ -18,15 +32,26 @@
int sort_class;
} detection;
+typedef struct detection_with_class {
+ detection det;
+ // The most probable class id: the best class index in this->prob.
+ // Is filled temporary when processing results, otherwise not initialized
+ int best_class;
+} detection_with_class;
+
box float_to_box(float *f);
float box_iou(box a, box b);
float box_rmse(box a, box b);
dbox diou(box a, box b);
void do_nms(box *boxes, float **probs, int total, int classes, float thresh);
-void do_nms_sort(box *boxes, float **probs, int total, int classes, float thresh);
-void do_nms_sort_v3(detection *dets, int total, int classes, float thresh);
-void do_nms_obj_v3(detection *dets, int total, int classes, float thresh);
+void do_nms_sort_v2(box *boxes, float **probs, int total, int classes, float thresh);
+YOLODLL_API void do_nms_sort(detection *dets, int total, int classes, float thresh);
+YOLODLL_API void do_nms_obj(detection *dets, int total, int classes, float thresh);
box decode_box(box b, box anchor);
box encode_box(box b, box anchor);
+// Creates array of detections with prob > thresh and fills best_class for them
+// Return number of selected detections in *selected_detections_num
+detection_with_class* get_actual_detections(detection *dets, int dets_num, float thresh, int* selected_detections_num);
+
#endif
--
Gitblit v1.10.0