From 71bc53bd043d272ded70635fdaade22f3c288605 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期五, 10 七月 2020 13:10:29 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Process/ProcessControl.cs | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/Bro.Process/ProcessControl.cs b/src/Bro.Process/ProcessControl.cs
index 948b3c0..afbc38d 100644
--- a/src/Bro.Process/ProcessControl.cs
+++ b/src/Bro.Process/ProcessControl.cs
@@ -626,7 +626,7 @@
#endregion
#region 鍥惧儚澶勭悊
- protected HImage CollectHImage(CameraBase camera, IOperationConfig opConfig, out string imgSetId, [CallerMemberName]string methodCode = "")
+ protected IImageSet CollectHImage(CameraBase camera, IOperationConfig opConfig, [CallerMemberName]string methodCode = "")
{
IImageSet set = null;
@@ -675,8 +675,7 @@
TimeRecordCSV(DateTime.Now, camera.Name, methodCode + "閲囧浘", (int)sw.ElapsedMilliseconds);
}
- imgSetId = set?.Id;
- return set.HImage;
+ return set;
}
protected async void CameraUpdateImage(CameraBase camera, Bitmap image, string setId)
--
Gitblit v1.8.0