Merge pull request #36 from thomaslevesque/fix-gdi-handle-leak

Fix GDI handle leak
XamlAnimatedGif · Sep 27, 2017 · 822555f · 822555f
2 parents 5e30f4e + 12408d5
commit 822555f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,7 @@ NuGetPackages/
 
 # Roslyn cache directories
 *.ide/
+.vs/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
@@ -189,4 +190,4 @@ FakesAssemblies/
 # NDepend output
 NDependOut/
 
-issues/
+issues/
diff --git a/WpfAnimatedGif.nuspec b/WpfAnimatedGif.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>WpfAnimatedGif</id>
     <title>WPF Animated GIF</title>
-    <version>1.4.14</version>
+    <version>1.4.15</version>
     <description>A simple library to display animated GIF images in WPF</description>
     <summary>A simple library to display animated GIF images in WPF</summary>
     <authors>Thomas Levesque</authors>

diff --git a/WpfAnimatedGif/ImageBehavior.cs b/WpfAnimatedGif/ImageBehavior.cs
@@ -492,9 +492,11 @@ private static BitmapSource ClearArea(BitmapSource frame, FrameMetadata metadata
                     PixelFormats.Pbgra32);
             bitmap.Render(visual);
 
-            if (bitmap.CanFreeze && !bitmap.IsFrozen)
-                bitmap.Freeze();
-            return bitmap;
+            var result = new WriteableBitmap(bitmap);
+
+            if (result.CanFreeze && !result.IsFrozen)
+                result.Freeze();
+            return result;
         }
 
         private static void TryTwice(Action action)
@@ -668,9 +670,11 @@ private static BitmapSource MakeFrame(
                 PixelFormats.Pbgra32);
             bitmap.Render(visual);
 
-            if (bitmap.CanFreeze && !bitmap.IsFrozen)
-                bitmap.Freeze();
-            return bitmap;
+            var result = new WriteableBitmap(bitmap);
+
+            if (result.CanFreeze && !result.IsFrozen)
+                result.Freeze();
+            return result;
         }
 
         private static RepeatBehavior GetActualRepeatBehavior(Image imageControl, BitmapDecoder decoder, GifFile gifMetadata)

diff --git a/WpfAnimatedGif/Properties/AssemblyInfo.cs b/WpfAnimatedGif/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@ class VersionInfo
         /// <summary>
         /// Single place to define version
         /// </summary>
-        public const string VersionString = "1.4.14";
+        public const string VersionString = "1.4.15";
     }
 }