From 1f16245b4b4fc36c519e7afc9fd9cf828f25199d Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 28 二月 2019 20:06:35 +0800
Subject: [PATCH] 修改新增摄像机获取底图问题 解码两次问题
---
QiaoJiaSystem/YoloServer/YoloDetectServerI.h | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/YoloServer/YoloDetectServerI.h b/QiaoJiaSystem/YoloServer/YoloDetectServerI.h
index ed5203a..40b25a2 100644
--- a/QiaoJiaSystem/YoloServer/YoloDetectServerI.h
+++ b/QiaoJiaSystem/YoloServer/YoloDetectServerI.h
@@ -8,10 +8,10 @@
#include <opencv2/opencv.hpp>
#include <basic/util/resource/ResourcesManager.h>
-#include "DnDetect.h"
-#include <atomic>
+//#include "DnDetect.h"
+//#include <atomic>
-struct DnDetectRes {
+/*struct DnDetectRes {
public:
DnDetectRes() : i(3) {
}
@@ -21,7 +21,7 @@
std::unordered_map<int, std::thread::id> map_pid;
// 鎺ュ彈鐨勭嚎绋嬩釜鏁�
int i;
-};
+};*/
class YoloDetectServerI : public YoloDetect::YoloDetectServer {
public:
@@ -45,7 +45,7 @@
bool m_bInitThd;
std::thread m_thdInit;
- std::map<int, DnDetectRes> map_dnDetRes;
+// std::map<int, DnDetectRes> map_dnDetRes;
// ResourcesManager<int> resourcesManager;
@@ -53,6 +53,8 @@
static int init(void *arg);
+ image matToImg(cv::Mat &RefImg);
+
cv::Mat bufferToMat(const int w, const int h, const int channels, const void *buffer);
--
Gitblit v1.8.0