From 7734dad8901d8ee40f5a7ba5d04800ca41540dab Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 20:39:06 +0800
Subject: [PATCH] Merge branch 'feature_uploadPersonCutImage' into ywv1.2

---
 QiaoJiaSystem/StructureApp/TrackingTrigger.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/TrackingTrigger.h b/QiaoJiaSystem/StructureApp/TrackingTrigger.h
index 8fe9509..2e86b19 100644
--- a/QiaoJiaSystem/StructureApp/TrackingTrigger.h
+++ b/QiaoJiaSystem/StructureApp/TrackingTrigger.h
@@ -9,8 +9,8 @@
 using namespace std;
 
 struct ScoredRect {
-    ScoredRect() : id(-1) ,isMask(false){}
-    bool isMask;
+    ScoredRect() : id(-1) ,isMove(false){}
+    bool isMove;
     float score;
     cv::Rect rect;
     long id;

--
Gitblit v1.8.0