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/FaceDetectServer/FaceDetectServerI.cpp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp b/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp
index 7e2236d..a52e916 100644
--- a/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp
+++ b/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp
@@ -32,6 +32,8 @@
         delete[] param;
     }
     THFP_Create(threadMax);
+    m_ampleSize =
+        appPref.getIntData("FaceDetectionSampleSize") > 0 ? appPref.getIntData("FaceDetectionSampleSize") : 640;
 }
 
 FaceDetectServerI::~FaceDetectServerI() {
@@ -48,7 +50,7 @@
         auto data = shareMemory.constData();
         THFI_FacePos facesPos[30];
         int channel = detectResourcesManager.getAvilableChannel(shareMemoryName);
-        int faceNum = THFI_DetectFace(channel, (BYTE *) data, 24, width, height, facesPos, 30);
+        int faceNum = THFI_DetectFace(channel, (BYTE *) data, 24, width, height, facesPos, 30, m_ampleSize);
         if (faceNum > 0) {
             for (int i = 0; i < faceNum; i++) {
                 FaceDetect::FacePos face;

--
Gitblit v1.8.0