修正读取24bpprgb文件

ScanCodeServer/Form1.cs

@@ -23,6 +23,8 @@ namespace ScanCodeServer
             InitializeComponent();
             InitializeComponent();
             server = Config.Get("Addr", "http://0.0.0.0:58137");
             server = Config.Get("Addr", "http://0.0.0.0:58137");
             WebServer.Open(server);
             WebServer.Open(server);
+            textBox_addr.Text = Config.Get("Addr", "http://0.0.0.0:58137");
+            server = textBox_addr.Text;
             FormClosing += Form1_FormClosing;
             FormClosing += Form1_FormClosing;
             Shown += Form1_Shown;
             Shown += Form1_Shown;
             Resize += Form1_Resize;
             Resize += Form1_Resize;
@@ -134,7 +136,17 @@ namespace ScanCodeServer
 
 
         private void btn_test_Click(object sender, EventArgs e)
         private void btn_test_Click(object sender, EventArgs e)
         {
         {
-            Bitmap bitmap = new Bitmap("test.bmp");
+            string file = "test.bmp";
+            OpenFileDialog openFileDialog = new OpenFileDialog();
+            openFileDialog.Title = "Select an Image";
+            openFileDialog.Filter = "Image files (*.bmp, *.png)|*.bmp; *.png;"; // 设置对话框的筛选条件
+
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                file = openFileDialog.FileName;
+            }
+
+            Bitmap bitmap = new Bitmap(file);
             WebWork webWork = new WebWork();
             WebWork webWork = new WebWork();
             HDCodeHelper.Bitmap2HObjectBpp24(bitmap, out HObject ho_Image);
             HDCodeHelper.Bitmap2HObjectBpp24(bitmap, out HObject ho_Image);
             //bitmap.Dispose();
             //bitmap.Dispose();

ScanCodeServer/HDCodeHelper.cs

@@ -253,6 +253,8 @@ namespace ScanCodeServer
                 BitmapData srcBmpData = bmp.LockBits(rect, ImageLockMode.ReadOnly, bmp.PixelFormat);
                 BitmapData srcBmpData = bmp.LockBits(rect, ImageLockMode.ReadOnly, bmp.PixelFormat);
                 if (bmp.PixelFormat == PixelFormat.Format8bppIndexed)
                 if (bmp.PixelFormat == PixelFormat.Format8bppIndexed)
                     HOperatorSet.GenImage1(out ho_Image, "byte", bmp.Width, bmp.Height, srcBmpData.Scan0);
                     HOperatorSet.GenImage1(out ho_Image, "byte", bmp.Width, bmp.Height, srcBmpData.Scan0);
+                else if (bmp.PixelFormat == PixelFormat.Format24bppRgb)
+                    HOperatorSet.GenImageInterleaved(out ho_Image, srcBmpData.Scan0, "rgb", bmp.Width, bmp.Height, 0, "byte", 0, 0, 0, 0, -1, 0);
                 else
                 else
                     HOperatorSet.GenImageInterleaved(out ho_Image, srcBmpData.Scan0, "bgrx", bmp.Width, bmp.Height, 0, "byte", 0, 0, 0, 0, -1, 0);
                     HOperatorSet.GenImageInterleaved(out ho_Image, srcBmpData.Scan0, "bgrx", bmp.Width, bmp.Height, 0, "byte", 0, 0, 0, 0, -1, 0);
                 bmp.UnlockBits(srcBmpData);
                 bmp.UnlockBits(srcBmpData);

ScanCodeServer/WebServer.cs

-using Microsoft.Win32;
+using ConfigHelper;
+using Microsoft.Win32;
 using System;
 using System;
 using System.ServiceModel;
 using System.ServiceModel;
 using System.ServiceModel.Web;
 using System.ServiceModel.Web;
@@ -22,6 +23,7 @@ namespace ScanCodeServer
                 _serviceHost.Open();
                 _serviceHost.Open();
                 Registry.SetValue("HKEY_LOCAL_MACHINE\\SOFTWARE\\ScanCodeServer\\", "port", u.Port);
                 Registry.SetValue("HKEY_LOCAL_MACHINE\\SOFTWARE\\ScanCodeServer\\", "port", u.Port);
                 Common.log.Info("Web服务已开启，URL=" + url);
                 Common.log.Info("Web服务已开启，URL=" + url);
+                Config.Set("Addr", url);
                 IsOpen = true;
                 IsOpen = true;
             }
             }
             catch (AddressAlreadyInUseException ex)
             catch (AddressAlreadyInUseException ex)