From 65509ea2a0808389a07a446f2df1cadb16d97dbc Mon Sep 17 00:00:00 2001
From: C3032 <C3032@BC3032>
Date: 星期二, 30 十二月 2025 16:36:05 +0800
Subject: [PATCH] Merge branch 'master' into feature/HR_Camera
---
LB_VisionProcesses/Alogrithms/Halcon/2D/HFindLineTool/HFindLineTool.cs | 29 +----------------------------
1 files changed, 1 insertions(+), 28 deletions(-)
diff --git a/LB_VisionProcesses/Alogrithms/Halcon/2D/HFindLineTool/HFindLineTool.cs b/LB_VisionProcesses/Alogrithms/Halcon/2D/HFindLineTool/HFindLineTool.cs
index 2ced791..533a89c 100644
--- a/LB_VisionProcesses/Alogrithms/Halcon/2D/HFindLineTool/HFindLineTool.cs
+++ b/LB_VisionProcesses/Alogrithms/Halcon/2D/HFindLineTool/HFindLineTool.cs
@@ -3,7 +3,6 @@
using LB_VisionProcesses.Alogrithms.Halcon;
using System;
using System.Collections.Generic;
-using System.Drawing.Imaging;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -62,33 +61,7 @@
Result = false;
return;
}
- if (InputImage is Bitmap)
- {
- try
- {
- using (HImage hImage = new HImage())
- {
- Rectangle rect = new Rectangle(0, 0, ((Bitmap)InputImage).Width, ((Bitmap)InputImage).Height);
- BitmapData srcBmpData = ((Bitmap)InputImage).LockBits(rect, ImageLockMode.ReadOnly, PixelFormat.Format32bppRgb);
- hImage.GenImageInterleaved(srcBmpData.Scan0, "rgbx", ((Bitmap)InputImage).Width, ((Bitmap)InputImage).Height, 0, "byte", ((Bitmap)InputImage).Width, ((Bitmap)InputImage).Height, 0, 0, -1, 0);
- ((Bitmap)InputImage).UnlockBits(srcBmpData);
- ((Bitmap)InputImage).Dispose();
- InputImage = hImage.Clone();
- }
- }
- catch (Exception ex)
- {
- Msg = "杞浘鍑洪敊锛�" + ex.Message;
- Result = false;
- return;
- }
- }
- if (!(InputImage is HObject))
- {
- Msg = "杈撳叆鍥剧墖鏍煎紡涓嶄负Mat";
- Result = false;
- return;
- }
+
#region 瑁佸壀鍖哄煙
if (!(Params.ROI is HSegment))
{
--
Gitblit v1.9.3