From 8bda216c1afbec706fdd77f9ffb2acfb6d9f2b46 Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期四, 10 一月 2019 19:25:02 +0800
Subject: [PATCH] commit
---
QiaoJiaSystem/build/YoloServer | 0
QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp | 4 ++++
QiaoJiaSystem/build/config.db | 0
QiaoJiaSystem/CMakeLists.txt | 2 +-
4 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/CMakeLists.txt b/QiaoJiaSystem/CMakeLists.txt
index 2da842a..400e343 100644
--- a/QiaoJiaSystem/CMakeLists.txt
+++ b/QiaoJiaSystem/CMakeLists.txt
@@ -16,7 +16,7 @@
add_subdirectory(StructureApp)
add_subdirectory(FaceDetectServer)
-#add_subdirectory(YoloServer)
+add_subdirectory(YoloServer)
add_subdirectory(FaceSearchServer)
add_subdirectory(VideoAnalysFromHC)
add_subdirectory(RapidStructureApp)
diff --git a/QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp b/QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp
index cb0e612..ac073c3 100644
--- a/QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp
+++ b/QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp
@@ -35,6 +35,10 @@
//printf("Predicted in %f seconds.\n", what_time_is_it_now()-attime);
int nboxes = 0;
detection *dets = get_network_boxes(m_net, im.w, im.h, m_thresh, m_hier_thresh, 0, 1, &nboxes);
+ if(nboxes>30)
+ {
+ return objInfos;
+ }
if (m_nms) do_nms_sort(dets, nboxes, l.classes, m_nms);
// draw_detections(im, dets, nboxes, m_thresh, names, alphabet, l.classes);
for (int i = 0; i < nboxes; i++) {
diff --git a/QiaoJiaSystem/build/YoloServer b/QiaoJiaSystem/build/YoloServer
new file mode 100755
index 0000000..9c16de1
--- /dev/null
+++ b/QiaoJiaSystem/build/YoloServer
Binary files differ
diff --git a/QiaoJiaSystem/build/config.db b/QiaoJiaSystem/build/config.db
index 26c9a27..e69de29 100644
--- a/QiaoJiaSystem/build/config.db
+++ b/QiaoJiaSystem/build/config.db
Binary files differ
--
Gitblit v1.8.0