From 0436e5443295395025f89f0d091aab1e9551d1a4 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 20:26:31 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of ssh://192.168.1.226:29418/development/c++ into ywv1.2
---
QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp b/QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp
index ac073c3..a806136 100644
--- a/QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp
+++ b/QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp
@@ -35,8 +35,7 @@
//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)
- {
+ if (nboxes > 30) {
return objInfos;
}
if (m_nms) do_nms_sort(dets, nboxes, l.classes, m_nms);
--
Gitblit v1.8.0