From 564877ad6a3f53d3d866b0015237d07f4af2eaa2 Mon Sep 17 00:00:00 2001
From: vinjn <vinjn.z@gmail.com>
Date: Sat, 07 Jul 2018 04:30:45 +0000
Subject: [PATCH] cuda.h - converts tab to space
---
src/yolo_v2_class.cpp | 31 ++++++++++++-------------------
1 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/src/yolo_v2_class.cpp b/src/yolo_v2_class.cpp
index 6147e3c..4df9be5 100644
--- a/src/yolo_v2_class.cpp
+++ b/src/yolo_v2_class.cpp
@@ -22,32 +22,24 @@
#define FRAMES 3
-int max_objects() { return C_SHARP_MAX_OBJECTS; }
+//static Detector* detector = NULL;
+static std::unique_ptr<Detector> detector;
-static Detector* detector;
-//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();
}
-int detect_image2(const uint8_t* data, const size_t data_length, bbox_t_container &container) {
+int detect_mat(const uint8_t* data, const size_t data_length, bbox_t_container &container) {
#ifdef OPENCV
std::vector<char> vdata(data, data + data_length);
cv::Mat image = imdecode(cv::Mat(vdata), 1);
@@ -62,8 +54,9 @@
}
int dispose() {
- detector->~Detector();
- //detector.reset();
+ //if (detector != NULL) delete detector;
+ //detector = NULL;
+ detector.reset();
return 1;
}
--
Gitblit v1.10.0