From dac3e12cc046aabeefd828b3f03794fe2bc0ba06 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期四, 09 七月 2020 09:54:26 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Common.Device/DeviceBase/CameraBase.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/Bro.Common.Device/DeviceBase/CameraBase.cs b/src/Bro.Common.Device/DeviceBase/CameraBase.cs
index a7f721c..440c7d0 100644
--- a/src/Bro.Common.Device/DeviceBase/CameraBase.cs
+++ b/src/Bro.Common.Device/DeviceBase/CameraBase.cs
@@ -152,7 +152,7 @@
set.IsOriginSaved = !set.ImageSaveOption.IsSaveOriginImage;
set.IsFitSaved = !set.ImageSaveOption.IsSaveFitImage;
- set.IsAddtionalSaved = !string.IsNullOrWhiteSpace(set.ImageSaveOption.AddtionalSaveType);
+ set.IsAddtionalSaved = string.IsNullOrWhiteSpace(set.ImageSaveOption.AddtionalSaveType);
set.OnImageSetTimeout += ImageSet_OnImageSetTimeout;
_imageSetList.Add(set);
@@ -181,7 +181,7 @@
{
set.IsOriginSaved = !set.ImageSaveOption.IsSaveOriginImage;
set.IsFitSaved = !set.ImageSaveOption.IsSaveFitImage;
- set.IsAddtionalSaved = !string.IsNullOrWhiteSpace(set.ImageSaveOption.AddtionalSaveType);
+ set.IsAddtionalSaved = string.IsNullOrWhiteSpace(set.ImageSaveOption.AddtionalSaveType);
set.OnImageSetTimeout += ImageSet_OnImageSetTimeout;
_imageSetList.Add(set);
}
@@ -539,7 +539,7 @@
});
}
- protected async void Generate16GrayImageByPointer(int width, int height, IntPtr dataPtr, string imgSetId)
+ protected async Task Generate16GrayImageByPointer(int width, int height, IntPtr dataPtr, string imgSetId)
{
await Task.Run(() =>
{
@@ -897,7 +897,7 @@
public ImageSet()
{
- autoDisposeTimer = new Timer(OnAutoDispose, null, -1, 10 * 1000);
+ autoDisposeTimer = new Timer(OnAutoDispose, null, 10 * 1000, -1);
}
public virtual void Dispose()
--
Gitblit v1.8.0