This reverts changes from commit 20fcf84311, affecting the png encoder

Renamed DeflateCompressionLevel back to PngCompressionLevel

src/ImageSharp/Formats/Png/IPngEncoderOptions.cs

@@ -28,9 +28,9 @@ namespace SixLabors.ImageSharp.Formats.Png
 
         /// <summary>
         /// Gets the compression level 1-9.
-        /// <remarks>Defaults to <see cref="DeflateCompressionLevel.DefaultCompression"/>.</remarks>
+        /// <remarks>Defaults to <see cref="PngCompressionLevel.DefaultCompression"/>.</remarks>
         /// </summary>
-        DeflateCompressionLevel CompressionLevel { get; }
+        PngCompressionLevel CompressionLevel { get; }
 
         /// <summary>
         /// Gets the threshold of characters in text metadata, when compression should be used.

src/ImageSharp/Formats/Png/DeflateCompressionLevel.cs → src/ImageSharp/Formats/Png/PngCompressionLevel.cs

@@ -6,7 +6,7 @@ namespace SixLabors.ImageSharp.Formats.Png
     /// <summary>
     /// Provides enumeration of available PNG compression levels.
     /// </summary>
-    public enum DeflateCompressionLevel
+    public enum PngCompressionLevel
     {
         /// <summary>
         /// Level 0. Equivalent to <see cref="NoCompression"/>.

src/ImageSharp/Formats/Png/PngEncoder.cs

@@ -25,7 +25,7 @@ namespace SixLabors.ImageSharp.Formats.Png
         public PngFilterMethod? FilterMethod { get; set; }
 
         /// <inheritdoc/>
-        public DeflateCompressionLevel CompressionLevel { get; set; } = DeflateCompressionLevel.DefaultCompression;
+        public PngCompressionLevel CompressionLevel { get; set; } = PngCompressionLevel.DefaultCompression;
 
         /// <inheritdoc/>
         public int TextCompressionThreshold { get; set; } = 1024;

src/ImageSharp/Formats/Png/PngEncoderOptions.cs

@@ -44,7 +44,7 @@ namespace SixLabors.ImageSharp.Formats.Png
         public PngFilterMethod? FilterMethod { get; }
 
         /// <inheritdoc/>
-        public DeflateCompressionLevel CompressionLevel { get; } = DeflateCompressionLevel.DefaultCompression;
+        public PngCompressionLevel CompressionLevel { get; } = PngCompressionLevel.DefaultCompression;
 
         /// <inheritdoc/>
         public int TextCompressionThreshold { get; }

src/ImageSharp/Formats/Png/Zlib/ZlibDeflateStream.cs

@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Runtime.CompilerServices;
+using SixLabors.ImageSharp.Compression;
 using SixLabors.ImageSharp.Memory;
 
 namespace SixLabors.ImageSharp.Formats.Png.Zlib
@@ -39,7 +40,6 @@ namespace SixLabors.ImageSharp.Formats.Png.Zlib
         /// <summary>
         /// The stream responsible for compressing the input stream.
         /// </summary>
-        // private DeflateStream deflateStream;
         private DeflaterOutputStream deflateStream;
 
         /// <summary>
@@ -49,6 +49,17 @@ namespace SixLabors.ImageSharp.Formats.Png.Zlib
         /// <param name="stream">The stream to compress.</param>
         /// <param name="level">The compression level.</param>
         public ZlibDeflateStream(MemoryAllocator memoryAllocator, Stream stream, DeflateCompressionLevel level)
+            : this(memoryAllocator, stream, (PngCompressionLevel)level)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ZlibDeflateStream"/> class.
+        /// </summary>
+        /// <param name="memoryAllocator">The memory allocator to use for buffer allocations.</param>
+        /// <param name="stream">The stream to compress.</param>
+        /// <param name="level">The compression level.</param>
+        public ZlibDeflateStream(MemoryAllocator memoryAllocator, Stream stream, PngCompressionLevel level)
         {
             int compressionLevel = (int)level;
             this.rawStream = stream;

tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs

@@ -63,19 +63,19 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
         /// <summary>
         /// All types except Palette
         /// </summary>
-        public static readonly TheoryData<DeflateCompressionLevel> CompressionLevels
-        = new TheoryData<DeflateCompressionLevel>
+        public static readonly TheoryData<PngCompressionLevel> CompressionLevels
+        = new TheoryData<PngCompressionLevel>
         {
-            DeflateCompressionLevel.Level0,
-            DeflateCompressionLevel.Level1,
-            DeflateCompressionLevel.Level2,
-            DeflateCompressionLevel.Level3,
-            DeflateCompressionLevel.Level4,
-            DeflateCompressionLevel.Level5,
-            DeflateCompressionLevel.Level6,
-            DeflateCompressionLevel.Level7,
-            DeflateCompressionLevel.Level8,
-            DeflateCompressionLevel.Level9,
+            PngCompressionLevel.Level0,
+            PngCompressionLevel.Level1,
+            PngCompressionLevel.Level2,
+            PngCompressionLevel.Level3,
+            PngCompressionLevel.Level4,
+            PngCompressionLevel.Level5,
+            PngCompressionLevel.Level6,
+            PngCompressionLevel.Level7,
+            PngCompressionLevel.Level8,
+            PngCompressionLevel.Level9,
         };
 
         public static readonly TheoryData<int> PaletteSizes = new TheoryData<int>
@@ -158,7 +158,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
 
         [Theory]
         [WithTestPatternImages(nameof(CompressionLevels), 24, 24, PixelTypes.Rgba32)]
-        public void WorksWithAllCompressionLevels<TPixel>(TestImageProvider<TPixel> provider, DeflateCompressionLevel compressionLevel)
+        public void WorksWithAllCompressionLevels<TPixel>(TestImageProvider<TPixel> provider, PngCompressionLevel compressionLevel)
             where TPixel : unmanaged, IPixel<TPixel>
         {
             foreach (PngInterlaceMode interlaceMode in InterlaceMode)
@@ -574,7 +574,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
             PngFilterMethod pngFilterMethod,
             PngBitDepth bitDepth,
             PngInterlaceMode interlaceMode,
-            DeflateCompressionLevel compressionLevel = DeflateCompressionLevel.DefaultCompression,
+            PngCompressionLevel compressionLevel = PngCompressionLevel.DefaultCompression,
             int paletteSize = 255,
             bool appendPngColorType = false,
             bool appendPngFilterMethod = false,

tests/ImageSharp.Tests/Image/ImageTests.SaveAsync.cs

@@ -138,7 +138,7 @@ namespace SixLabors.ImageSharp.Tests
             public async Task SaveAsync_WithNonSeekableStream_IsCancellable()
             {
                 using var image = new Image<Rgba32>(4000, 4000);
-                var encoder = new PngEncoder() { CompressionLevel = DeflateCompressionLevel.BestCompression };
+                var encoder = new PngEncoder() { CompressionLevel = PngCompressionLevel.BestCompression };
                 using var stream = new MemoryStream();
                 var asyncStream = new AsyncStreamWrapper(stream, () => false);
                 var cts = new CancellationTokenSource();