From 0a762a217fe499b7b63d55ed4b46dde1afd49f28 Mon Sep 17 00:00:00 2001 From: pans <pansen626@sina.com> Date: 星期一, 15 四月 2019 16:57:06 +0800 Subject: [PATCH] .3nsq: Auto stash before merge of "1.3nsq" and "origin/1.3nsq" --- QiaoJiaSystem/StructureApp/AppPipeController.cpp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.cpp b/QiaoJiaSystem/StructureApp/AppPipeController.cpp index fcddc04..4e59bc8 100644 --- a/QiaoJiaSystem/StructureApp/AppPipeController.cpp +++ b/QiaoJiaSystem/StructureApp/AppPipeController.cpp @@ -95,7 +95,7 @@ perHubElement(ruleMap[PerHubSdk]), leftJudgment(ruleMap[KeepRightSdk]), rightJudgment(ruleMap[KeepRightSdk]), - bRecordVideoEnable(RecordVideoEnable), +// bRecordVideoEnable(RecordVideoEnable), m_sdkRuleMap(ruleMap), m_bSetWH(false) { DBG("camId" << camId); @@ -530,7 +530,7 @@ #else vptRpcElement.registerConnector([&] { if (!perimeterElement.isBusy()) { - perimeterElement.setYoloObjects(vptRpcElement.getLastHpRects()); + perimeterElement.setYoloObjects(vptRpcElement.getLastScoreRects()); perimeterElement.setImage(vptRpcElement.getImage()); perimeterElement.submit(); } -- Gitblit v1.8.0