From efafab5273ba3ff13a19f07088c320a5180188b6 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期四, 31 一月 2019 10:49:56 +0800
Subject: [PATCH] 1.2_布控feature: Auto stash before merge of "ywv1.2_布控feature" and "origin/ywv1.2_布控feature"
---
QiaoJiaSystem/FaceSearchServer/AlarmServer.hpp | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/FaceSearchServer/AlarmServer.hpp b/QiaoJiaSystem/FaceSearchServer/AlarmServer.hpp
index 1fe1b9c..05c80aa 100644
--- a/QiaoJiaSystem/FaceSearchServer/AlarmServer.hpp
+++ b/QiaoJiaSystem/FaceSearchServer/AlarmServer.hpp
@@ -27,6 +27,8 @@
std::vector<std::vector<unsigned char>> features;
std::string faceUrl;
std::string idcard;
+ std::string enabled;
+ std::string monLevel;
};
static std::vector<std::string> AlarmServerPropertyAnalyseByComma(std::string str_list) {
@@ -100,7 +102,7 @@
//m_dbReady is false return,true go on
//use parallelFor
- virtual bool compare(std::thread::id key, AlarmData *, int topN) = 0;
+ virtual bool compare(std::thread::id key, AlarmData *, int topN, float score) = 0;
private:
//init data,this is thread body
--
Gitblit v1.8.0