From 60c6c6db56e04e98fa829055d8d2113e65c33be7 Mon Sep 17 00:00:00 2001 From: Kagamia Date: Tue, 14 Jul 2015 08:31:34 +0800 Subject: [PATCH] fix gif generation bug --- WzComparerR2.Common/Gif.cs | 4 ++-- WzComparerR2.Common/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WzComparerR2.Common/Gif.cs b/WzComparerR2.Common/Gif.cs index a81f207f..5df69090 100644 --- a/WzComparerR2.Common/Gif.cs +++ b/WzComparerR2.Common/Gif.cs @@ -114,7 +114,7 @@ public Bitmap EncodeGif2(Color backgrnd, int minAlpha, int startIndex, int frame GifEncoder enc; byte a = backgrnd.A; - backgrnd = Color.FromArgb(255, backgrnd); + Color backgrndColor = Color.FromArgb(255, backgrnd); if (a == 0xff) //纯色 { enc = new GifEncoder(tempFileName, rect.Width, rect.Height, 256, backgrnd); @@ -198,7 +198,7 @@ private static Bitmap PrepareFrame(IGifFrame frame, Rectangle canvasRect, Color frameRect.Offset(-canvasRect.X, -canvasRect.Y); frame.Draw(g, canvasRect); - BitmapData data = gifFrame.LockBits(canvasRect, ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); + BitmapData data = gifFrame.LockBits(new Rectangle(Point.Empty, gifFrame.Size), ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); byte[] buffer = new byte[data.Stride * data.Height]; Marshal.Copy(data.Scan0, buffer, 0, buffer.Length); diff --git a/WzComparerR2.Common/Properties/AssemblyInfo.cs b/WzComparerR2.Common/Properties/AssemblyInfo.cs index a354d49e..922082a0 100644 --- a/WzComparerR2.Common/Properties/AssemblyInfo.cs +++ b/WzComparerR2.Common/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1.0")] -[assembly: AssemblyFileVersion("1.0.1.50703")] +[assembly: AssemblyVersion("1.0.2.0")] +[assembly: AssemblyFileVersion("1.0.1.50714")]