From db043cb402515837303880cb0948d060e9d76490 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 15 四月 2019 17:13:16 +0800
Subject: [PATCH] 整合代码

---
 QiaoJiaSystem/VptServer/VptServerI.cpp |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/VptServer/VptServerI.cpp b/QiaoJiaSystem/VptServer/VptServerI.cpp
index c8b3361..62f80ab 100644
--- a/QiaoJiaSystem/VptServer/VptServerI.cpp
+++ b/QiaoJiaSystem/VptServer/VptServerI.cpp
@@ -9,12 +9,24 @@
 VptServerI::VptServerI() {}
 
 VptServerI::~VptServerI() {
-
+    for (auto item_ptr : m_map_vptDetectWrapper) {
+        if (item_ptr.second != nullptr) {
+            delete item_ptr.second;
+            item_ptr.second = nullptr;
+        }
+        m_map_vptDetectWrapper.erase(item_ptr.first);
+    }
 }
 
 VptDetect::ObjInfos
 VptServerI::VptDetect(Ice::Int width, Ice::Int height, const ::std::string &shM,
                       const ::Ice::Current &current) {
+
+    thread::id key = std::this_thread::get_id();
+    if (m_map_vptDetectWrapper.find(key) == m_map_vptDetectWrapper.end()) {
+        m_map_vptDetectWrapper[key] = new VptDetectWrapper();
+    }
+    VptDetectWrapper &m_vptDetectWrapper = *m_map_vptDetectWrapper[key];
 
     VptDetect::ObjInfos objInfos;
     QSharedMemory shareMemory(QString(shM.c_str()));
@@ -27,6 +39,7 @@
             ::VptDetect::VptDetectResult vptDetectResult;
 
             vptDetectResult.sdkDetectType = static_cast<Ice::Int>(item.sdkDetectType);
+            vptDetectResult.obj_score = item.obj_score;
 
             vptDetectResult.bskRect.left = item.bskRect.left_;
             vptDetectResult.bskRect.top = item.bskRect.top_;

--
Gitblit v1.8.0