From bff7644f31501fb8dd547e032e5ef6de67cf673e Mon Sep 17 00:00:00 2001
From: Tino Hager <tino.hager@nager.at>
Date: Wed, 27 Jun 2018 21:59:10 +0000
Subject: [PATCH] remove max_objects
---
src/yolo_v2_class.cpp | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/yolo_v2_class.cpp b/src/yolo_v2_class.cpp
index aad5876..4df9be5 100644
--- a/src/yolo_v2_class.cpp
+++ b/src/yolo_v2_class.cpp
@@ -22,24 +22,18 @@
#define FRAMES 3
-static Detector* detector;
-//static std::unique_ptr<Detector> detector;
+//static Detector* detector = NULL;
+static std::unique_ptr<Detector> detector;
-int init(const char *configurationFilename, const char *weightsFilename, int gpu) {
- std::string configurationFilenameString;
- configurationFilenameString = configurationFilename;
- std::string weightsFilenameString;
- weightsFilenameString = weightsFilename;
-
- detector = new Detector(configurationFilenameString, weightsFilenameString, gpu);
+int init(const char *configurationFilename, const char *weightsFilename, int gpu)
+{
+ detector.reset(new Detector(configurationFilename, weightsFilename, gpu));
return 1;
}
-int detect_image(const char *filename, bbox_t_container &container) {
- std::string filenameString;
- filenameString = filename;
-
- std::vector<bbox_t> detection = detector->detect(filenameString);
+int detect_image(const char *filename, bbox_t_container &container)
+{
+ std::vector<bbox_t> detection = detector->detect(filename);
for (size_t i = 0; i < detection.size() && i < C_SHARP_MAX_OBJECTS; ++i)
container.candidates[i] = detection[i];
return detection.size();
@@ -60,8 +54,9 @@
}
int dispose() {
- detector->~Detector();
- //detector.reset();
+ //if (detector != NULL) delete detector;
+ //detector = NULL;
+ detector.reset();
return 1;
}
--
Gitblit v1.10.0