From 5e4eb1ea589e228f888194ef3d31c24de468d788 Mon Sep 17 00:00:00 2001 From: lhiven <236881222@qq.com> Date: Thu, 29 Feb 2024 08:05:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E8=BF=94=E5=9B=9E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=90=8E=E8=B0=83=E7=94=A8GC=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=EF=BC=9A2.20.24.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.Camera/HikCamera.cs | 8 ++++++-- Rs.Camera/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Rs.Camera/HikCamera.cs b/Rs.Camera/HikCamera.cs index e0dcfa3..8fc970c 100644 --- a/Rs.Camera/HikCamera.cs +++ b/Rs.Camera/HikCamera.cs @@ -76,6 +76,9 @@ namespace Rs.Camera private void ImageCallBack(IntPtr pData, ref MyCamera.MV_FRAME_OUT_INFO_EX pFrameInfo, IntPtr pUser) { + HObject image; + HOperatorSet.GenEmptyObj(out image); + image.Dispose(); int nIndex = (int)pUser; string cameraname = string.Empty; foreach(KeyValuePair kv in cameraIDs) @@ -86,11 +89,10 @@ namespace Rs.Camera break; } } - LogHelper.Debug($"{cameraname}有相机数据返回"); - HObject image = new HObject(); //m_BufForDriver = Marshal.AllocHGlobal((Int32)pFrameInfo.nFrameLen); //CopyMemory(m_BufForDriver, pData, pFrameInfo.nFrameLen); HOperatorSet.GenImage1(out image, "byte", pFrameInfo.nWidth, pFrameInfo.nHeight, pData); + //Marshal.FreeHGlobal(pData); //HOperatorSet.RotateImage(image, out HObject rotateImage, 270, "constant"); if (camTrigger!=null && camTrigger.ContainsKey(nIndex)) { @@ -112,7 +114,9 @@ namespace Rs.Camera // ImageProcess.AddAutoTrigger(image); //} } + //image.Dispose(); //Marshal.FreeHGlobal(pData); + GC.Collect(); } } diff --git a/Rs.Camera/Properties/AssemblyInfo.cs b/Rs.Camera/Properties/AssemblyInfo.cs index 8751520..b4a9d33 100644 --- a/Rs.Camera/Properties/AssemblyInfo.cs +++ b/Rs.Camera/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("2.20.24.1")] //[assembly: AssemblyFileVersion("1.0.0.0")]