From 91fbc7bca400b7ce958e306f09133e4cfc6db63b Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 03 四月 2019 11:23:25 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' of ssh://192.168.1.226:29418/development/c++ into yangwu1.3
---
QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp b/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp
index b9206a9..c4f3caf 100644
--- a/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp
+++ b/QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp
@@ -7,8 +7,8 @@
#include <THFaceProperty_i.h>
FaceDetectServerI::FaceDetectServerI() {
- long threadMax = appPref.getLongData("thread.max");
- long gpuIndex = appPref.getLongData("gpu.index");
+ long threadMax = appPref.getIntData("thread.max");
+ long gpuIndex = appPref.getIntData("gpu.index");
for (int i = 0; i < threadMax; i++) {
detectResourcesManager.pushResource(i);
}
@@ -44,7 +44,7 @@
FaceDetect::Faces FaceDetectServerI::faceDetect(Ice::Int width, Ice::Int height, const std::string &shareMemoryName,
const Ice::Current &) {
ClockTimer ct("FaceDetectServerI::faceDetect");
- INFO("Face Detect");
+// INFO("Face Detect");
FaceDetect::Faces faces;
QSharedMemory shareMemory(QString(shareMemoryName.c_str()));
if (shareMemory.attach()) {
@@ -53,6 +53,7 @@
int channel = detectResourcesManager.getAvilableChannel(shareMemoryName);
int faceNum = THFI_DetectFace(channel, (BYTE *) data, 24, width, height, facesPos, 30, m_ampleSize);
if (faceNum > 0) {
+ DBG("Face num is :" << faceNum);
for (int i = 0; i < faceNum; i++) {
FaceDetect::FacePos face;
auto &pos = facesPos[i];
@@ -63,7 +64,7 @@
faces.push_back(face);
}
} else {
- DBG("Face num is 0");
+// DBG("Face num is 0");
}
} else {
ERR("shareMemory error " << shareMemoryName);
--
Gitblit v1.8.0