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/FaceDBCompareServer.h | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h
index 7940970..492fbbf 100644
--- a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h
+++ b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h
@@ -27,9 +27,7 @@
~FaceDBCompareServer();
- virtual bool compare(std::thread::id key, AlarmData *alarmData, int topN);
-
- bool compare(std::thread::id key, AlarmData *alarmData);
+ virtual bool compare(std::thread::id key, AlarmData *alarmData, int topN, float score = 0.0);
FaceResults getTopResult(std::thread::id key);
@@ -41,6 +39,7 @@
std::string m_tableName;
int fea_size;
+// 閿佹暟鎹埛鏂�
RWLock m_rwLock;
std::mutex topResultMtx;
std::map<std::thread::id, FaceResults> topResult;
--
Gitblit v1.8.0