fix gif generation bug

Kagamia · Jul 14, 2015 · 60c6c6d · 60c6c6d
1 parent 29fb010
commit 60c6c6d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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")]