Remove IImageInfo, IImage and use inheritance.

Author: JimBobSquarePants

src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs

@@ -215,15 +215,15 @@ private BmpInfoHeader CreateBmpInfoHeader(int width, int height, int infoHeaderS
 
         BmpInfoHeader infoHeader = new(
             headerSize: infoHeaderSize,
-            height: height,
             width: width,
-            bitsPerPixel: bpp,
+            height: height,
             planes: 1,
+            bitsPerPixel: bpp,
             imageSize: height * bytesPerLine,
-            clrUsed: 0,
-            clrImportant: 0,
             xPelsPerMeter: hResolution,
-            yPelsPerMeter: vResolution);
+            yPelsPerMeter: vResolution,
+            clrUsed: 0,
+            clrImportant: 0);
 
         if ((this.infoHeaderType is BmpInfoHeaderType.WinVersion4 or BmpInfoHeaderType.WinVersion5) && this.bitsPerPixel == BmpBitsPerPixel.Pixel32)
         {
@@ -470,7 +470,7 @@ private void Write8BitColor<TPixel>(Stream stream, Image<TPixel> image, Span<byt
         using IQuantizer<TPixel> frameQuantizer = this.quantizer.CreatePixelSpecificQuantizer<TPixel>(this.configuration);
 
         frameQuantizer.BuildPalette(this.pixelSamplingStrategy, image);
-        using IndexedImageFrame<TPixel> quantized = frameQuantizer.QuantizeFrame(image.Frames.RootFrame, image.Bounds());
+        using IndexedImageFrame<TPixel> quantized = frameQuantizer.QuantizeFrame(image.Frames.RootFrame, image.Bounds);
 
         ReadOnlySpan<TPixel> quantizedColorPalette = quantized.Palette.Span;
         this.WriteColorPalette(stream, quantizedColorPalette, colorPalette);
@@ -541,7 +541,7 @@ private void Write4BitPixelData<TPixel>(Stream stream, Image<TPixel> image)
 
         frameQuantizer.BuildPalette(this.pixelSamplingStrategy, image);
 
-        using IndexedImageFrame<TPixel> quantized = frameQuantizer.QuantizeFrame(image.Frames.RootFrame, image.Bounds());
+        using IndexedImageFrame<TPixel> quantized = frameQuantizer.QuantizeFrame(image.Frames.RootFrame, image.Bounds);
         using IMemoryOwner<byte> colorPaletteBuffer = this.memoryAllocator.Allocate<byte>(ColorPaletteSize4Bit, AllocationOptions.Clean);
 
         Span<byte> colorPalette = colorPaletteBuffer.GetSpan();
@@ -588,7 +588,7 @@ private void Write2BitPixelData<TPixel>(Stream stream, Image<TPixel> image)
 
         frameQuantizer.BuildPalette(this.pixelSamplingStrategy, image);
 
-        using IndexedImageFrame<TPixel> quantized = frameQuantizer.QuantizeFrame(image.Frames.RootFrame, image.Bounds());
+        using IndexedImageFrame<TPixel> quantized = frameQuantizer.QuantizeFrame(image.Frames.RootFrame, image.Bounds);
         using IMemoryOwner<byte> colorPaletteBuffer = this.memoryAllocator.Allocate<byte>(ColorPaletteSize2Bit, AllocationOptions.Clean);
 
         Span<byte> colorPalette = colorPaletteBuffer.GetSpan();
@@ -644,7 +644,7 @@ private void Write1BitPixelData<TPixel>(Stream stream, Image<TPixel> image)
 
         frameQuantizer.BuildPalette(this.pixelSamplingStrategy, image);
 
-        using IndexedImageFrame<TPixel> quantized = frameQuantizer.QuantizeFrame(image.Frames.RootFrame, image.Bounds());
+        using IndexedImageFrame<TPixel> quantized = frameQuantizer.QuantizeFrame(image.Frames.RootFrame, image.Bounds);
         using IMemoryOwner<byte> colorPaletteBuffer = this.memoryAllocator.Allocate<byte>(ColorPaletteSize1Bit, AllocationOptions.Clean);
 
         Span<byte> colorPalette = colorPaletteBuffer.GetSpan();

src/ImageSharp/Formats/Gif/GifEncoderCore.cs

@@ -99,12 +99,12 @@ public void Encode<TPixel>(Image<TPixel> image, Stream stream, CancellationToken
             if (useGlobalTable)
             {
                 frameQuantizer.BuildPalette(this.pixelSamplingStrategy, image);
-                quantized = frameQuantizer.QuantizeFrame(image.Frames.RootFrame, image.Bounds());
+                quantized = frameQuantizer.QuantizeFrame(image.Frames.RootFrame, image.Bounds);
             }
             else
             {
                 frameQuantizer.BuildPalette(this.pixelSamplingStrategy, image.Frames.RootFrame);
-                quantized = frameQuantizer.QuantizeFrame(image.Frames.RootFrame, image.Bounds());
+                quantized = frameQuantizer.QuantizeFrame(image.Frames.RootFrame, image.Bounds);
             }
         }
 

src/ImageSharp/Formats/ImageDecoder.cs

@@ -172,7 +172,7 @@ private static bool ShouldResize(DecoderOptions options, Image image)
         }
 
         Size targetSize = options.TargetSize.Value;
-        Size currentSize = image.Size();
+        Size currentSize = image.Size;
         return currentSize.Width != targetSize.Width && currentSize.Height != targetSize.Height;
     }
 

src/ImageSharp/Formats/Pbm/PbmEncoderCore.cs

@@ -68,7 +68,7 @@ public void Encode<TPixel>(Image<TPixel> image, Stream stream, CancellationToken
         this.SanitizeAndSetEncoderOptions(image);
 
         byte signature = this.DeduceSignature();
-        this.WriteHeader(stream, signature, image.Size());
+        this.WriteHeader(stream, signature, image.Size);
 
         this.WritePixels(stream, image.Frames.RootFrame);
 

src/ImageSharp/Formats/Png/PngEncoderCore.cs

@@ -1300,7 +1300,7 @@ private static IndexedImageFrame<TPixel> CreateQuantizedFrame<TPixel>(
         using IQuantizer<TPixel> frameQuantizer = quantizer.CreatePixelSpecificQuantizer<TPixel>(image.GetConfiguration());
 
         frameQuantizer.BuildPalette(encoder.PixelSamplingStrategy, image);
-        return frameQuantizer.QuantizeFrame(image.Frames.RootFrame, image.Bounds());
+        return frameQuantizer.QuantizeFrame(image.Frames.RootFrame, image.Bounds);
     }
 
     /// <summary>

src/ImageSharp/IImage.cs

@@ -14,11 +14,9 @@ namespace SixLabors.ImageSharp;
 /// For the non-generic <see cref="Image"/> type, the pixel type is only known at runtime.
 /// <see cref="Image"/> is always implemented by a pixel-specific <see cref="Image{TPixel}"/> instance.
 /// </summary>
-public abstract partial class Image : IImage, IConfigurationProvider
+public abstract partial class Image : ImageInfo, IDisposable, IConfigurationProvider
 {
     private bool isDisposed;
-
-    private Size size;
     private readonly Configuration configuration;
 
     /// <summary>
@@ -27,16 +25,12 @@ public abstract partial class Image : IImage, IConfigurationProvider
     /// <param name="configuration">
     /// The configuration which allows altering default behaviour or extending the library.
     /// </param>
-    /// <param name="pixelType">The <see cref="PixelTypeInfo"/>.</param>
-    /// <param name="metadata">The <see cref="ImageMetadata"/>.</param>
-    /// <param name="size">The <see cref="size"/>.</param>
+    /// <param name="pixelType">The pixel type information.</param>
+    /// <param name="metadata">The image metadata.</param>
+    /// <param name="size">The size in px units.</param>
     protected Image(Configuration configuration, PixelTypeInfo pixelType, ImageMetadata metadata, Size size)
-    {
-        this.configuration = configuration ?? Configuration.Default;
-        this.PixelType = pixelType;
-        this.size = size;
-        this.Metadata = metadata ?? new ImageMetadata();
-    }
+       : base(pixelType, size, metadata)
+        => this.configuration = configuration ?? Configuration.Default;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="Image"/> class.
@@ -61,18 +55,6 @@ internal Image(
     /// </summary>
     protected abstract ImageFrameCollection NonGenericFrameCollection { get; }
 
-    /// <inheritdoc/>
-    public PixelTypeInfo PixelType { get; }
-
-    /// <inheritdoc />
-    public int Width => this.size.Width;
-
-    /// <inheritdoc />
-    public int Height => this.size.Height;
-
-    /// <inheritdoc/>
-    public ImageMetadata Metadata { get; }
-
     /// <summary>
     /// Gets the frames of the image as (non-generic) <see cref="ImageFrameCollection"/>.
     /// </summary>
@@ -148,7 +130,7 @@ public abstract Image<TPixel2> CloneAs<TPixel2>(Configuration configuration)
     /// Update the size of the image after mutation.
     /// </summary>
     /// <param name="size">The <see cref="Size"/>.</param>
-    protected void UpdateSize(Size size) => this.size = size;
+    protected void UpdateSize(Size size) => this.Size = size;
 
     /// <summary>
     /// Disposes the object and frees resources for the Garbage Collector.

src/ImageSharp/IImageInfo.cs

@@ -9,32 +9,60 @@ namespace SixLabors.ImageSharp;
 /// <summary>
 /// Contains information about the image including dimensions, pixel type information and additional metadata
 /// </summary>
-public sealed class ImageInfo : IImageInfo
+public class ImageInfo
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="ImageInfo"/> class.
     /// </summary>
-    /// <param name="pixelType">The image pixel type information.</param>
-    /// <param name="width">The width of the image in pixels.</param>
-    /// <param name="height">The height of the image in pixels.</param>
-    /// <param name="metadata">The images metadata.</param>
+    /// <param name="pixelType">The pixel type information.</param>
+    /// <param name="width">The width of the image in px units.</param>
+    /// <param name="height">The height of the image in px units.</param>
+    /// <param name="metadata">The image metadata.</param>
     public ImageInfo(PixelTypeInfo pixelType, int width, int height, ImageMetadata metadata)
+        : this(pixelType, new(width, height), metadata)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ImageInfo"/> class.
+    /// </summary>
+    /// <param name="pixelType">The pixel type information.</param>
+    /// <param name="size">The size of the image in px units.</param>
+    /// <param name="metadata">The image metadata.</param>
+    public ImageInfo(PixelTypeInfo pixelType, Size size, ImageMetadata metadata)
     {
         this.PixelType = pixelType;
-        this.Width = width;
-        this.Height = height;
-        this.Metadata = metadata;
+        this.Metadata = metadata ?? new ImageMetadata();
+        this.Size = size;
     }
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Gets information about the image pixels.
+    /// </summary>
     public PixelTypeInfo PixelType { get; }
 
-    /// <inheritdoc />
-    public int Width { get; }
+    /// <summary>
+    /// Gets the image width in px units.
+    /// </summary>
+    public int Width => this.Size.Width;
 
-    /// <inheritdoc />
-    public int Height { get; }
+    /// <summary>
+    /// Gets the image height in px units.
+    /// </summary>
+    public int Height => this.Size.Height;
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Gets any metadata associated wit The image.
+    /// </summary>
     public ImageMetadata Metadata { get; }
+
+    /// <summary>
+    /// Gets the size of the image in px units.
+    /// </summary>
+    public Size Size { get; internal set; }
+
+    /// <summary>
+    /// Gets the bounds of the image.
+    /// </summary>
+    public Rectangle Bounds => new(0, 0, this.Width, this.Height);
 }