Skip to content

Commit 3dbbe65

Browse files
authored
Merge pull request #5218 from rubberduck-vba/revert-5211-PlugWPFLeak
Revert "Plug the WPF leak... maybe."
2 parents 6129710 + 747b1c8 commit 3dbbe65

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

Rubberduck.Core/UI/Converters/ImageSourceConverter.cs

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,17 @@ public abstract class ImageSourceConverter : IValueConverter
1212
{
1313
protected static ImageSource ToImageSource(Image source)
1414
{
15-
using (var ms = new MemoryStream())
16-
{
17-
((Bitmap) source).Save(ms, System.Drawing.Imaging.ImageFormat.Png);
18-
var image = new BitmapImage();
19-
image.BeginInit();
20-
image.CacheOption = BitmapCacheOption.OnLoad;
21-
ms.Seek(0, SeekOrigin.Begin);
22-
image.StreamSource = ms;
23-
image.EndInit();
24-
image.Freeze();
15+
var ms = new MemoryStream();
2516

26-
return image;
27-
}
17+
((Bitmap)source).Save(ms, System.Drawing.Imaging.ImageFormat.Png);
18+
var image = new BitmapImage();
19+
image.BeginInit();
20+
ms.Seek(0, SeekOrigin.Begin);
21+
image.StreamSource = ms;
22+
image.EndInit();
23+
image.Freeze();
24+
25+
return image;
2826
}
2927

3028
public abstract object Convert(object value, Type targetType, object parameter, CultureInfo culture);

0 commit comments

Comments
 (0)