fix

jacmaz · Nov 21, 2015 · aa6d1b5 · aa6d1b5
1 parent 4b1db6e
commit aa6d1b5
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/DataEditorX/Common/MyBitmap.cs b/DataEditorX/Common/MyBitmap.cs
@@ -48,7 +48,6 @@ public static Bitmap Zoom(Bitmap sourceBitmap, int newWidth, int newHeight)
                 Rectangle srcRect = new Rectangle(0, 0, sourceBitmap.Width, sourceBitmap.Height);
                 graphics.DrawImage(sourceBitmap, newRect, srcRect, GraphicsUnit.Pixel);
                 graphics.Dispose();
-                sourceBitmap.Dispose();
                 return b;
             }
             return sourceBitmap;
@@ -105,7 +104,6 @@ public static Bitmap Cut(Bitmap sourceBitmap, int StartX, int StartY, int cutWid
                 Rectangle srcRect = new Rectangle(StartX, StartY, cutWidth, cutHeight);
                 graphics.DrawImage(sourceBitmap, cutRect, srcRect, GraphicsUnit.Pixel);
                 graphics.Dispose();
-                sourceBitmap.Dispose();
                 return bitmap;
             }
             return sourceBitmap;

diff --git a/DataEditorX/Core/TaskHelper.cs b/DataEditorX/Core/TaskHelper.cs
@@ -124,6 +124,7 @@ public void ToImg(string img, string saveimg1, string saveimg2)
                                 saveimg1, imgSet.quilty);
             MyBitmap.SaveAsJPEG(MyBitmap.Zoom(bmp, imgSet.w, imgSet.h),
                                 saveimg2, imgSet.quilty);
+			bmp.Dispose();
         }
         #endregion
 
@@ -193,6 +194,7 @@ public void CutImages(string imgpath, bool isreplace)
                     {
                         bmp = MyBitmap.Cut(bp, imgSet.normalArea);
                     }
+					bp.Dispose();
                     MyBitmap.SaveAsJPEG(bmp, savejpg, imgSet.quilty);
                     //bmp.Save(savejpg, ImageFormat.Png);
                 }

diff --git a/win32/DataEditorX.exe b/win32/DataEditorX.exe
diff --git a/win32/win32.zip b/win32/win32.zip