From 351996d9f0390ef44412fa678bc7a073a94e23e5 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Thu, 16 Mar 2017 18:49:36 +0000
Subject: [PATCH] Fixed memory leak in DLL, added load_image() & free_image(), added read_names_from_file()
---
src/yolo_console_dll.cpp | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/yolo_console_dll.cpp b/src/yolo_console_dll.cpp
index 00eca16..4938ba8 100644
--- a/src/yolo_console_dll.cpp
+++ b/src/yolo_console_dll.cpp
@@ -1,6 +1,7 @@
#include <iostream>
#include <string>
#include <vector>
+#include <fstream>
//#define OPENCV
@@ -21,36 +22,54 @@
}
#endif // OPENCV
-
-void show_result(std::vector<bbox_t> result_vec) {
+void show_result(std::vector<bbox_t> const result_vec, std::vector<std::string> const obj_names) {
for (auto &i : result_vec) {
+ if (obj_names.size() > i.obj_id) std::cout << obj_names[i.obj_id] << " - ";
std::cout << "obj_id = " << i.obj_id << " - x = " << i.x << ", y = " << i.y
<< ", w = " << i.w << ", h = " << i.h
<< ", prob = " << i.prob << std::endl;
}
}
+std::vector<std::string> objects_names_from_file(std::string const filename) {
+ std::ifstream file(filename);
+ std::vector<std::string> file_lines;
+ if (!file.is_open()) return file_lines;
+ for(std::string line; file >> line;) file_lines.push_back(line);
+ std::cout << "object names loaded \n";
+ return file_lines;
+}
int main()
{
Detector detector("yolo-voc.cfg", "yolo-voc.weights");
+ auto obj_names = objects_names_from_file("data/voc.names");
+
while (true)
{
std::string filename;
std::cout << "input image filename: ";
std::cin >> filename;
if (filename.size() == 0) break;
-
+
+ try {
#ifdef OPENCV
- cv::Mat mat_img = cv::imread(filename);
- std::vector<bbox_t> result_vec = detector.detect(mat_img);
- draw_boxes(mat_img, result_vec);
+ cv::Mat mat_img = cv::imread(filename);
+ std::vector<bbox_t> result_vec = detector.detect(mat_img);
+ draw_boxes(mat_img, result_vec);
#else
- std::vector<bbox_t> result_vec = detector.detect(filename);
+ //std::vector<bbox_t> result_vec = detector.detect(filename);
+
+ auto img = detector.load_image(filename);
+ std::vector<bbox_t> result_vec = detector.detect(img);
+ detector.free_image(img);
#endif
- show_result(result_vec);
+ show_result(result_vec, obj_names);
+ }
+ catch (std::exception &e) { std::cerr << "exception: " << e.what() << "\n"; getchar(); }
+ catch (...) { std::cerr << "unknown exception \n"; getchar(); }
}
return 0;
--
Gitblit v1.10.0