From 2b1a3988c9fd35c39e3e43d0382d65a13c45efee Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期四, 14 三月 2019 10:38:27 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug

---
 QiaoJiaSystem/StructureApp/PerStaticElement.h |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/PerStaticElement.h b/QiaoJiaSystem/StructureApp/PerStaticElement.h
index edb88b8..6380f24 100644
--- a/QiaoJiaSystem/StructureApp/PerStaticElement.h
+++ b/QiaoJiaSystem/StructureApp/PerStaticElement.h
@@ -80,6 +80,9 @@
     unsigned long long m_lTime;
     EsDBTool* pManagerEsDB;
     bool m_bIsMask;
+    bool m_bSetWH;
+     cv::Point2i* pointArray;
+     int npts;
 };
 
 #endif // PAELEMENT_H

--
Gitblit v1.8.0