From 9bbbe29c81aa9cd183e840232f2bd973937d1ef4 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期二, 15 一月 2019 17:17:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2
---
QiaoJiaSystem/StructureApp/TrackingTrigger.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/TrackingTrigger.h b/QiaoJiaSystem/StructureApp/TrackingTrigger.h
index 2e86b19..a9aa7a8 100644
--- a/QiaoJiaSystem/StructureApp/TrackingTrigger.h
+++ b/QiaoJiaSystem/StructureApp/TrackingTrigger.h
@@ -28,6 +28,7 @@
if (lastRect.id >= 0 && (rect.rect & lastRect.rect).area() > lastRect.rect.area() * 0.4) {
found = true;
rect.id = lastRect.id;
+ lastRect.properties["time"]=rect.properties["time"];
rect.properties = lastRect.properties;
tempScoreRects.push_back(rect);
break;
--
Gitblit v1.8.0