加载图片修改

AccAOI/FrmAoiSetting.cs

@@ -69,7 +69,9 @@ namespace AccAOI
             if (System.IO.File.Exists(defaultImg))
             if (System.IO.File.Exists(defaultImg))
             {
             {
                 //读取图片内容
                 //读取图片内容
-                BaseImg = (Image)Image.FromFile(defaultImg).Clone();
+                Image file = (Image)Image.FromFile(defaultImg);
+                BaseImg = new Bitmap(file);
+                file.Dispose();
                 imageBox1.Image = BaseImg;
                 imageBox1.Image = BaseImg;
             }
             }
         
         
@@ -121,7 +123,10 @@ namespace AccAOI
             string fileName = openDialog.FileName;
             string fileName = openDialog.FileName;
 
 
             //读取图片内容
             //读取图片内容
-            BaseImg = (Image)Image.FromFile(fileName).Clone();
+            Image file = Image.FromFile(fileName);
+            //  BaseImg = (Image)Image.FromFile(fileName).Clone();
+            BaseImg = new Bitmap(file);
+            file.Dispose();
             if (Project != null)
             if (Project != null)
             {
             {
                 Project.standardImage = BaseImg;
                 Project.standardImage = BaseImg;
@@ -143,22 +148,25 @@ namespace AccAOI
                     MessageBox.Show("清先选择相机");
                     MessageBox.Show("清先选择相机");
                     return;
                     return;
                 }  //将图片保存到本地重新加载
                 }  //将图片保存到本地重新加载
-                string fileName = Application.StartupPath + @"\aimage\" +  DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss") + DateTime.Now.Millisecond.ToString().PadLeft(3, '0') ;
-                string file = @"\test.bmp";
+                string filePath = Application.StartupPath + @"\aimage\" +  DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss") + DateTime.Now.Millisecond.ToString().PadLeft(3, '0') ;
+                string fileName = @"\test.bmp";
                 using (Bitmap img = CameraManager.GetCamerImage(camera))
                 using (Bitmap img = CameraManager.GetCamerImage(camera))
                 {
                 {
                     if (img != null)
                     if (img != null)
                     {
                     {
-                        string path = Path.GetFullPath(fileName);
+                        string path = Path.GetFullPath(filePath);
                         if (!Directory.Exists(path))
                         if (!Directory.Exists(path))
                         {
                         {
                             Directory.CreateDirectory(path);
                             Directory.CreateDirectory(path);
                         }
                         }
-                        img.Save(fileName + file, ImageFormat.Bmp);
+                        img.Save(filePath + fileName, ImageFormat.Bmp);
                     }
                     }
                 }
                 }
                 GC.Collect();
                 GC.Collect();
-                BaseImg = (Image)Image.FromFile(fileName+ file).Clone();
+                Image file = (Image)Image.FromFile(filePath + fileName);
+                BaseImg = new Bitmap(file);
+                file.Dispose();
+             //   BaseImg = (Image)Image.FromFile(filePath+ file).Clone();
                 //读取图片内容
                 //读取图片内容
                 //BaseImg = (Image)img.Clone();
                 //BaseImg = (Image)img.Clone();
                 if (Project != null)
                 if (Project != null)
@@ -542,7 +550,10 @@ namespace AccAOI
             string fileName = openDialog.FileName;
             string fileName = openDialog.FileName;
 
 
             //读取图片内容
             //读取图片内容
-            TestImage = (Image)Image.FromFile(fileName).Clone();
+           // TestImage = (Image)Image.FromFile(fileName).Clone();
+            Image file = (Image)Image.FromFile(fileName);
+            TestImage = new Bitmap(file);
+            file.Dispose();
             testImageBox1.Image = TestImage;
             testImageBox1.Image = TestImage;
             if (testImageBox1.Visible.Equals(false))
             if (testImageBox1.Visible.Equals(false))
             {
             {

AccAOI/control/AioMarkControl.cs

@@ -63,7 +63,10 @@ namespace AccAOI.control
                 if (File.Exists(fileName))
                 if (File.Exists(fileName))
                 {
                 {
                     //读取图片内容
                     //读取图片内容
-                    checkImg = (Image)Image.FromFile(fileName).Clone();
+                   // checkImg = (Image)Image.FromFile(fileName).Clone();
+                    Image file = (Image)Image.FromFile(fileName);
+                    checkImg = new Bitmap(file);
+                    file.Dispose();
                 }
                 }
                 if (checkImg == null)
                 if (checkImg == null)
                 {
                 {

AccAOI/control/AioTempMatchControl.cs

@@ -62,7 +62,10 @@ namespace AccAOI.control
                 if (File.Exists(fileName))
                 if (File.Exists(fileName))
                 {
                 {
                     //读取图片内容
                     //读取图片内容
-                    checkImg = (Image)Image.FromFile(fileName).Clone();
+                    //checkImg = (Image)Image.FromFile(fileName).Clone();
+                    Image file = (Image)Image.FromFile(fileName);
+                    checkImg = new Bitmap(file);
+                    file.Dispose();
                 }
                 }
                 if (checkImg == null)
                 if (checkImg == null)
                 {
                 {