Migrate Bmp encoder

src/ImageSharp/Formats/Bmp/BmpEncoder.cs

@@ -2,16 +2,20 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Processors.Quantization;
+using SixLabors.ImageSharp.Processing;
 
 namespace SixLabors.ImageSharp.Formats.Bmp;
 
 /// <summary>
 /// Image encoder for writing an image to a stream as a Windows bitmap.
 /// </summary>
-public sealed class BmpEncoder : IImageEncoder, IBmpEncoderOptions
+public sealed class BmpEncoder : QuantizingImageEncoder
 {
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BmpEncoder"/> class.
+    /// </summary>
+    public BmpEncoder() => this.Quantizer = KnownQuantizers.Wu;
+
     /// <summary>
     /// Gets or sets the number of bits per pixel.
     /// </summary>
@@ -25,25 +29,17 @@ public sealed class BmpEncoder : IImageEncoder, IBmpEncoderOptions
     /// </summary>
     public bool SupportTransparency { get; set; }
 
-    /// <summary>
-    /// Gets or sets the quantizer for reducing the color count for 8-Bit images.
-    /// Defaults to Wu Quantizer.
-    /// </summary>
-    public IQuantizer Quantizer { get; set; }
-
     /// <inheritdoc/>
-    public void Encode<TPixel>(Image<TPixel> image, Stream stream)
-        where TPixel : unmanaged, IPixel<TPixel>
+    public override void Encode<TPixel>(Image<TPixel> image, Stream stream)
     {
-        var encoder = new BmpEncoderCore(this, image.GetMemoryAllocator());
+        BmpEncoderCore encoder = new(this, image.GetMemoryAllocator());
         encoder.Encode(image, stream);
     }
 
     /// <inheritdoc/>
-    public Task EncodeAsync<TPixel>(Image<TPixel> image, Stream stream, CancellationToken cancellationToken)
-        where TPixel : unmanaged, IPixel<TPixel>
+    public override Task EncodeAsync<TPixel>(Image<TPixel> image, Stream stream, CancellationToken cancellationToken)
     {
-        var encoder = new BmpEncoderCore(this, image.GetMemoryAllocator());
+        BmpEncoderCore encoder = new(this, image.GetMemoryAllocator());
         return encoder.EncodeAsync(image, stream, cancellationToken);
     }
 }

src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs

@@ -95,14 +95,14 @@ internal sealed class BmpEncoderCore : IImageEncoderInternals
     /// <summary>
     /// Initializes a new instance of the <see cref="BmpEncoderCore"/> class.
     /// </summary>
-    /// <param name="options">The encoder options.</param>
+    /// <param name="encoder">The Bmp encoder.</param>
     /// <param name="memoryAllocator">The memory manager.</param>
-    public BmpEncoderCore(IBmpEncoderOptions options, MemoryAllocator memoryAllocator)
+    public BmpEncoderCore(BmpEncoder encoder, MemoryAllocator memoryAllocator)
     {
         this.memoryAllocator = memoryAllocator;
-        this.bitsPerPixel = options.BitsPerPixel;
-        this.quantizer = options.Quantizer ?? KnownQuantizers.Octree;
-        this.infoHeaderType = options.SupportTransparency ? BmpInfoHeaderType.WinVersion4 : BmpInfoHeaderType.WinVersion3;
+        this.bitsPerPixel = encoder.BitsPerPixel;
+        this.quantizer = encoder.Quantizer ?? KnownQuantizers.Octree;
+        this.infoHeaderType = encoder.SupportTransparency ? BmpInfoHeaderType.WinVersion4 : BmpInfoHeaderType.WinVersion3;
     }
 
     /// <summary>

src/ImageSharp/Formats/Bmp/IBmpEncoderOptions.cs

@@ -1,30 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.Processing.Processors.Quantization;
-
-namespace SixLabors.ImageSharp.Formats.Bmp;
-
-/// <summary>
-/// Configuration options for use during bmp encoding.
-/// </summary>
-internal interface IBmpEncoderOptions
-{
-    /// <summary>
-    /// Gets the number of bits per pixel.
-    /// </summary>
-    BmpBitsPerPixel? BitsPerPixel { get; }
-
-    /// <summary>
-    /// Gets a value indicating whether the encoder should support transparency.
-    /// Note: Transparency support only works together with 32 bits per pixel. This option will
-    /// change the default behavior of the encoder of writing a bitmap version 3 info header with no compression.
-    /// Instead a bitmap version 4 info header will be written with the BITFIELDS compression.
-    /// </summary>
-    bool SupportTransparency { get; }
-
-    /// <summary>
-    /// Gets the quantizer for reducing the color count for 8-Bit, 4-Bit, and 1-Bit images.
-    /// </summary>
-    IQuantizer Quantizer { get; }
-}