From 8ec1013ce8ff41e933b21590333431ac45b4b536 Mon Sep 17 00:00:00 2001 From: Dmitry Pentin Date: Fri, 14 May 2021 00:55:27 +0300 Subject: [PATCH] Removed redundant flag from Image.Dispose(bool) call As Image does not have unmanaged resources and does not implement finalizer method, there's no need for disposable pattern with a pair of Dispose() & Dispose(bool). Due Dispose(bool) was changed to DisposeManaged(). --- src/ImageSharp/Image.cs | 7 +++---- src/ImageSharp/Image{TPixel}.cs | 8 +------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/ImageSharp/Image.cs b/src/ImageSharp/Image.cs index 3aa30063d8..a3b425233b 100644 --- a/src/ImageSharp/Image.cs +++ b/src/ImageSharp/Image.cs @@ -87,7 +87,7 @@ namespace SixLabors.ImageSharp return; } - this.Dispose(true); + this.DisposeManaged(); this.isDisposed = true; } @@ -148,10 +148,9 @@ namespace SixLabors.ImageSharp protected void UpdateSize(Size size) => this.size = size; /// - /// Disposes the object and frees resources for the Garbage Collector. + /// Internal routine for freeing managed resources called from /// - /// Whether to dispose of managed and unmanaged objects. - protected abstract void Dispose(bool disposing); + protected abstract void DisposeManaged(); /// /// Throws if the image is disposed. diff --git a/src/ImageSharp/Image{TPixel}.cs b/src/ImageSharp/Image{TPixel}.cs index c436430522..1fc77dc1f0 100644 --- a/src/ImageSharp/Image{TPixel}.cs +++ b/src/ImageSharp/Image{TPixel}.cs @@ -268,13 +268,7 @@ namespace SixLabors.ImageSharp } /// - protected override void Dispose(bool disposing) - { - if (disposing) - { - this.frames.Dispose(); - } - } + protected override void DisposeManaged() => this.frames.Dispose(); /// public override string ToString() => $"Image<{typeof(TPixel).Name}>: {this.Width}x{this.Height}";