From 99221e4721a1246883465c2b52fbff14eb9aaa7a Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期六, 30 三月 2019 12:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yangwu1.3' into yangwu1.3

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

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

--
Gitblit v1.8.0