From 2cf69b4bbe56fc379c7f433037e043d0dba42493 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期五, 15 二月 2019 15:58:59 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ into ywv1.2
---
QiaoJiaSystem/StructureApp/PerimeterElement.h | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.h b/QiaoJiaSystem/StructureApp/PerimeterElement.h
index d259bb8..b9d28a2 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.h
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.h
@@ -16,8 +16,8 @@
class PerimeterElement : public basic::PipeElement
{
public:
- PerimeterElement(){}
- PerimeterElement(const SdkRule& rule,SaveVideoRpcClient_t& rpcClient);
+ PerimeterElement():m_rpcClient("RtspAnalysServer", "127.0.0.1",10009,"tcp"){}
+ PerimeterElement(const SdkRule& rule);
public:
~PerimeterElement();
@@ -53,7 +53,7 @@
void setImage(const cv::Mat &value) const;
private:
- PerimeterElement(const SdkRule& rule);
+ //PerimeterElement(const SdkRule& rule);
virtual void threadInitial()override;
@@ -90,7 +90,7 @@
std::vector<Point> poly1;
bool m_bSetWH;
cv::Point2i* pointArray;
- SaveVideoRpcClient_t& m_rpcClient;
+ SaveVideoRpcClient_t m_rpcClient;
};
--
Gitblit v1.8.0