Skip to content

Try to Dispose everything #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mee-ironsoftware merged 2 commits into from
Feb 23, 2023
Merged

Try to Dispose everything #41

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
214b8e9
Update AnyBitmap.cs
mee-ironsoftware Feb 21, 2023
48f768d
Merge branch 'master' into dispose-object-in-anybitmap
mee-ironsoftware Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 31 additions & 19 deletions IronSoftware.Drawing/IronSoftware.Drawing.Common/AnyBitmap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public AnyBitmap Clone()
public AnyBitmap Clone(CropRectangle Rectangle)
{
using SixLabors.ImageSharp.Image image = Image.Clone(img => img.Crop(Rectangle));
using var memoryStream = new System.IO.MemoryStream();
using System.IO.MemoryStream memoryStream = new System.IO.MemoryStream();
image.Save(memoryStream, new SixLabors.ImageSharp.Formats.Bmp.BmpEncoder()
{
BitsPerPixel = SixLabors.ImageSharp.Formats.Bmp.BmpBitsPerPixel.Pixel32,
Expand All @@ -135,7 +135,7 @@ public AnyBitmap Clone(CropRectangle Rectangle)
/// <returns>Transcoded image bytes.</returns>
public byte[] ExportBytes(ImageFormat Format = ImageFormat.Default, int Lossy = 100)
{
using var mem = new System.IO.MemoryStream();
using System.IO.MemoryStream mem = new System.IO.MemoryStream();
ExportStream(mem, Format, Lossy);
return mem.ToArray();
}
Expand All @@ -152,7 +152,7 @@ public byte[] ExportBytes(ImageFormat Format = ImageFormat.Default, int Lossy =

public void ExportFile(string File, ImageFormat Format = ImageFormat.Default, int Lossy = 100)
{
using var mem = new System.IO.MemoryStream();
using System.IO.MemoryStream mem = new System.IO.MemoryStream();
ExportStream(mem, Format, Lossy);

System.IO.File.WriteAllBytes(File, mem.ToArray());
Expand All @@ -168,7 +168,7 @@ public void ExportFile(string File, ImageFormat Format = ImageFormat.Default, in
/// <returns>Transcoded image bytes in a <see cref="MemoryStream"/>.</returns>
public System.IO.MemoryStream ToStream(ImageFormat Format = ImageFormat.Default, int Lossy = 100)
{
var stream = new System.IO.MemoryStream();
System.IO.MemoryStream stream = new System.IO.MemoryStream();
ExportStream(stream, Format, Lossy);
return stream;
}
Expand All @@ -182,7 +182,7 @@ public System.IO.MemoryStream ToStream(ImageFormat Format = ImageFormat.Default,
/// <returns>Transcoded image bytes in a Func<see cref="MemoryStream"/>>.</returns>
public Func<Stream> ToStreamFn(ImageFormat Format = ImageFormat.Default, int Lossy = 100)
{
var stream = new System.IO.MemoryStream();
System.IO.MemoryStream stream = new System.IO.MemoryStream();
ExportStream(stream, Format, Lossy);
stream.Position = 0;
return () => stream;
Expand Down Expand Up @@ -553,7 +553,7 @@ public IEnumerable<AnyBitmap> GetAllFrames
/// <returns></returns>
public static AnyBitmap CreateMultiFrameTiff(IEnumerable<string> imagePaths)
{
MemoryStream stream = CreateMultiFrameImage(CreateAnyBitmaps(imagePaths)) ?? throw new NotSupportedException("Image could not be loaded. File format is not supported.");
using MemoryStream stream = CreateMultiFrameImage(CreateAnyBitmaps(imagePaths)) ?? throw new NotSupportedException("Image could not be loaded. File format is not supported.");
stream.Seek(0, SeekOrigin.Begin);
return AnyBitmap.FromStream(stream);
}
Expand All @@ -568,7 +568,7 @@ public static AnyBitmap CreateMultiFrameTiff(IEnumerable<string> imagePaths)
/// <returns></returns>
public static AnyBitmap CreateMultiFrameTiff(IEnumerable<AnyBitmap> images)
{
MemoryStream stream = CreateMultiFrameImage(images) ?? throw new NotSupportedException("Image could not be loaded. File format is not supported.");
using MemoryStream stream = CreateMultiFrameImage(images) ?? throw new NotSupportedException("Image could not be loaded. File format is not supported.");
stream.Seek(0, SeekOrigin.Begin);
return AnyBitmap.FromStream(stream);
}
Expand All @@ -583,7 +583,7 @@ public static AnyBitmap CreateMultiFrameTiff(IEnumerable<AnyBitmap> images)
/// <returns></returns>
public static AnyBitmap CreateMultiFrameGif(IEnumerable<string> imagePaths)
{
MemoryStream stream = CreateMultiFrameImage(CreateAnyBitmaps(imagePaths), ImageFormat.Gif) ?? throw new NotSupportedException("Image could not be loaded. File format is not supported.");
using MemoryStream stream = CreateMultiFrameImage(CreateAnyBitmaps(imagePaths), ImageFormat.Gif) ?? throw new NotSupportedException("Image could not be loaded. File format is not supported.");
stream.Seek(0, SeekOrigin.Begin);
return AnyBitmap.FromStream(stream);
}
Expand All @@ -598,7 +598,7 @@ public static AnyBitmap CreateMultiFrameGif(IEnumerable<string> imagePaths)
/// <returns></returns>
public static AnyBitmap CreateMultiFrameGif(IEnumerable<AnyBitmap> images)
{
MemoryStream stream = CreateMultiFrameImage(images, ImageFormat.Gif) ?? throw new NotSupportedException("Image could not be loaded. File format is not supported.");
using MemoryStream stream = CreateMultiFrameImage(images, ImageFormat.Gif) ?? throw new NotSupportedException("Image could not be loaded. File format is not supported.");
stream.Seek(0, SeekOrigin.Begin);
return AnyBitmap.FromStream(stream);
}
Expand Down Expand Up @@ -770,7 +770,7 @@ public static implicit operator AnyBitmap(SixLabors.ImageSharp.Image<SixLabors.I
{
try
{
using var memoryStream = new System.IO.MemoryStream();
using System.IO.MemoryStream memoryStream = new System.IO.MemoryStream();
Image.Save(memoryStream, new SixLabors.ImageSharp.Formats.Bmp.BmpEncoder()
{
BitsPerPixel = SixLabors.ImageSharp.Formats.Bmp.BmpBitsPerPixel.Pixel24
Expand Down Expand Up @@ -818,7 +818,7 @@ public static implicit operator AnyBitmap(SixLabors.ImageSharp.Image<SixLabors.I
{
try
{
using var memoryStream = new System.IO.MemoryStream();
using System.IO.MemoryStream memoryStream = new System.IO.MemoryStream();
Image.Save(memoryStream, new SixLabors.ImageSharp.Formats.Bmp.BmpEncoder()
{
BitsPerPixel = SixLabors.ImageSharp.Formats.Bmp.BmpBitsPerPixel.Pixel32,
Expand Down Expand Up @@ -866,7 +866,7 @@ public static implicit operator AnyBitmap(SixLabors.ImageSharp.Image Image)
{
try
{
using var memoryStream = new System.IO.MemoryStream();
using System.IO.MemoryStream memoryStream = new System.IO.MemoryStream();
Image.Save(memoryStream, new SixLabors.ImageSharp.Formats.Bmp.BmpEncoder()
{
BitsPerPixel = SixLabors.ImageSharp.Formats.Bmp.BmpBitsPerPixel.Pixel32,
Expand Down Expand Up @@ -1022,7 +1022,7 @@ public static implicit operator AnyBitmap(Microsoft.Maui.Graphics.Platform.Platf
{
try
{
using var memoryStream = new System.IO.MemoryStream();
using System.IO.MemoryStream memoryStream = new System.IO.MemoryStream();
Image.Save(memoryStream);
return new AnyBitmap(memoryStream.ToArray());
}
Expand Down Expand Up @@ -1071,6 +1071,7 @@ public static implicit operator AnyBitmap(System.Drawing.Bitmap Image)
System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(blank);
g.Clear(Color.Transparent);
g.DrawImage(Image, 0, 0, Image.Width, Image.Height);
g.Dispose();

System.Drawing.Bitmap tempImage = new(blank);
blank.Dispose();
Expand Down Expand Up @@ -1146,6 +1147,7 @@ public static implicit operator AnyBitmap(System.Drawing.Image Image)
System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(blank);
g.Clear(Color.Transparent);
g.DrawImage(Image, 0, 0, Image.Width, Image.Height);
g.Dispose();

System.Drawing.Bitmap tempImage = new(blank);
blank.Dispose();
Expand Down Expand Up @@ -1505,7 +1507,7 @@ private void LoadImage(string File)

private void SetBinaryFromImageSharp(SixLabors.ImageSharp.Image<SixLabors.ImageSharp.PixelFormats.Rgba32> tiffImage)
{
using var memoryStream = new MemoryStream();
using MemoryStream memoryStream = new MemoryStream();
tiffImage.Save(memoryStream, new SixLabors.ImageSharp.Formats.Tiff.TiffEncoder());
memoryStream.Seek(0, SeekOrigin.Begin);
LoadImage(memoryStream);
Expand Down Expand Up @@ -1574,7 +1576,7 @@ private static PlatformNotSupportedException SystemDotDrawingPlatformNotSupporte

private static string GetMimeType(System.Drawing.Bitmap Image)
{
var imgguid = Image.RawFormat.Guid;
Guid imgguid = Image.RawFormat.Guid;
foreach (System.Drawing.Imaging.ImageCodecInfo codec in System.Drawing.Imaging.ImageCodecInfo.GetImageDecoders())
{
if (codec.FormatID == imgguid)
Expand All @@ -1585,7 +1587,7 @@ private static string GetMimeType(System.Drawing.Bitmap Image)

private static string GetMimeType(System.Drawing.Image Image)
{
var imgguid = Image.RawFormat.Guid;
Guid imgguid = Image.RawFormat.Guid;
foreach (System.Drawing.Imaging.ImageCodecInfo codec in System.Drawing.Imaging.ImageCodecInfo.GetImageDecoders())
{
if (codec.FormatID == imgguid)
Expand All @@ -1610,7 +1612,7 @@ private static SkiaSharp.SKBitmap OpenTiffToSKBitmap(AnyBitmap anyBitmap)
try
{
// create a memory stream out of them
MemoryStream tiffStream = new(anyBitmap.Binary);
using MemoryStream tiffStream = new(anyBitmap.Binary);

// open a TIFF stored in the stream
using var tifImg = BitMiracle.LibTiff.Classic.Tiff.ClientOpen("in-memory", "r", tiffStream, new BitMiracle.LibTiff.Classic.TiffStream());
Expand Down Expand Up @@ -1663,7 +1665,7 @@ private void OpenTiffToImageSharp(byte[] bytes)
List<SixLabors.ImageSharp.Image> images = new();

// create a memory stream out of them
MemoryStream tiffStream = new(bytes);
using MemoryStream tiffStream = new(bytes);

// open a TIFF stored in the stream
using (var tif = BitMiracle.LibTiff.Classic.Tiff.ClientOpen("in-memory", "r", tiffStream, new BitMiracle.LibTiff.Classic.TiffStream()))
Expand Down Expand Up @@ -1723,6 +1725,11 @@ private void OpenTiffToImageSharp(byte[] bytes)
tiffImage.Frames.AddFrame(image.Frames.RootFrame);
}
SetBinaryFromImageSharp(tiffImage);

foreach (SixLabors.ImageSharp.Image image in images)
{
image.Dispose();
}
}
catch (DllNotFoundException e)
{
Expand Down Expand Up @@ -1784,6 +1791,11 @@ private static MemoryStream CreateMultiFrameImage(IEnumerable<AnyBitmap> images,
}
}

if (result != null)
{
result.Dispose();
}

return resultStream;
}

Expand All @@ -1802,7 +1814,7 @@ private static void FindMaxWidthAndHeight(IEnumerable<AnyBitmap> images, out int
private SixLabors.ImageSharp.Image<SixLabors.ImageSharp.PixelFormats.Rgba32> CloneAndResizeImageSharp(
SixLabors.ImageSharp.Image source, int maxWidth, int maxHeight)
{
SixLabors.ImageSharp.Image<SixLabors.ImageSharp.PixelFormats.Rgba32> image =
using SixLabors.ImageSharp.Image<SixLabors.ImageSharp.PixelFormats.Rgba32> image =
source.CloneAs<SixLabors.ImageSharp.PixelFormats.Rgba32>();
// Keep Image dimension the same
return ResizeWithPadToPng(image, maxWidth, maxHeight);
Expand Down