From 29065df908aee41ab673cfc78a0d657e3063d5ef Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期六, 12 一月 2019 15:30:49 +0800
Subject: [PATCH] Merge branch 'ywv1.2_yolodebug'
---
QiaoJiaSystem/StructureApp/FaceExtractElement.h | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/FaceExtractElement.h b/QiaoJiaSystem/StructureApp/FaceExtractElement.h
index 8a1a0fb..f9f7d2b 100644
--- a/QiaoJiaSystem/StructureApp/FaceExtractElement.h
+++ b/QiaoJiaSystem/StructureApp/FaceExtractElement.h
@@ -12,7 +12,7 @@
#include <queue>
#include <mutex>
#include <jsoncpp/json/json.h>
-
+#include "DBStruct.h"
#define VECTOR_MAX 50
class QSharedMemory;
@@ -28,7 +28,7 @@
class FaceExtractElement : public TimerElement {
public:
- FaceExtractElement(std::string shareMemoryName);
+ FaceExtractElement(std::string shareMemoryName,const SdkRule& rule);
~FaceExtractElement();
@@ -55,6 +55,7 @@
std::vector<::FaceDetect::Data> features;
Base64 base64;
+ SdkRule m_sdkRule;
};
--
Gitblit v1.8.0