From a2ea58c567a078bb97a9e45a56fe50df41438d22 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 15 四月 2019 10:37:31 +0800
Subject: [PATCH] 整合c++ver1.3的修改代码进入该分支

---
 QiaoJiaSystem/StructureApp/FaceExtractElement.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp b/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp
index 56da883..88e51e8 100644
--- a/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp
+++ b/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp
@@ -54,7 +54,7 @@
 void FaceExtractElement::submitFaceExtract(FaceToExtract faceToExtract) {
     std::lock_guard<std::mutex> lg(imageQueueMutex);
     if (faceExtractQueue.size() >= VECTOR_MAX) {
-        ERR("FaceExtractElement::submitFaceExtract too fast, imageQueue.size()>=QUEUE_MAX")
+        ERR("FaceExtractElement::submitFaceExtract too fast, imageQueue.size()>=QUEUE_MAX : " << faceExtractQueue.size())
         return;
     }
     faceExtractQueue.push_back(faceToExtract);
@@ -66,7 +66,7 @@
     {
         std::lock_guard<std::mutex> lg(imageQueueMutex);
         if (faceExtractQueue.empty()) {
-            ERR("faceExtractQueue.empty ");
+//            ERR("faceExtractQueue.empty ");
             return;
         }
         faceExtractQueueTmp.swap(faceExtractQueue);
@@ -108,7 +108,7 @@
 
             unsigned long size = faceExtractQueueTmp[i].facesPos.size();
             for (int j = 0; j < size; j++) {
-                auto feature = extractServer->faceExtract(image.cols, image.rows, faceExtractQueueTmp[i].facesPos[j],
+				auto feature = extractServer->faceExtract(image.cols, image.rows, faceExtractQueueTmp[i].facesPos[j],
                                                           sharedMemory->key().toStdString());
 //                {
 //                    //#todo

--
Gitblit v1.8.0