Remove ChunkedMemoryStream

Author: JimBobSquarePants

src/ImageSharp/Formats/Gif/GifDecoderCore.cs

@@ -317,7 +317,7 @@ private void ReadApplicationExtension(BufferedReadStream stream)
             bool isXmp = this.buffer.Span.StartsWith(GifConstants.XmpApplicationIdentificationBytes);
             if (isXmp && !this.skipMetadata)
             {
-                GifXmpApplicationExtension extension = GifXmpApplicationExtension.Read(stream, this.memoryAllocator);
+                GifXmpApplicationExtension extension = GifXmpApplicationExtension.Read(stream);
                 if (extension.Data.Length > 0)
                 {
                     this.metadata!.XmpProfile = new XmpProfile(extension.Data);

src/ImageSharp/Formats/Gif/Sections/GifXmpApplicationExtension.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Memory;
 
 namespace SixLabors.ImageSharp.Formats.Gif;
@@ -26,11 +25,10 @@ namespace SixLabors.ImageSharp.Formats.Gif;
     /// Reads the XMP metadata from the specified stream.
     /// </summary>
     /// <param name="stream">The stream to read from.</param>
-    /// <param name="allocator">The memory allocator.</param>
     /// <returns>The XMP metadata</returns>
-    public static GifXmpApplicationExtension Read(Stream stream, MemoryAllocator allocator)
+    public static GifXmpApplicationExtension Read(Stream stream)
     {
-        byte[] xmpBytes = ReadXmpData(stream, allocator);
+        byte[] xmpBytes = ReadXmpData(stream);
 
         // Exclude the "magic trailer", see XMP Specification Part 3, 1.1.2 GIF
         int xmpLength = xmpBytes.Length - 256; // 257 - unread 0x0
@@ -71,9 +69,9 @@ public int WriteTo(Span<byte> buffer)
         return this.ContentLength;
     }
 
-    private static byte[] ReadXmpData(Stream stream, MemoryAllocator allocator)
+    private static byte[] ReadXmpData(Stream stream)
     {
-        using ChunkedMemoryStream bytes = new(allocator);
+        using MemoryStream bytes = new();
 
         // XMP data doesn't have a fixed length nor is there an indicator of the length.
         // So we simply read one byte at a time until we hit the 0x0 value at the end

src/ImageSharp/Formats/ImageDecoder.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 
@@ -210,7 +209,7 @@ T PerformActionAndResetPosition(Stream s, long position)
         }
 
         Configuration configuration = options.Configuration;
-        using ChunkedMemoryStream memoryStream = new(configuration.MemoryAllocator);
+        using MemoryStream memoryStream = new();
         stream.CopyTo(memoryStream, configuration.StreamProcessingBufferSize);
         memoryStream.Position = 0;
 
@@ -266,11 +265,6 @@ Task<T> PerformActionAndResetPosition(Stream s, long position, CancellationToken
             return PerformActionAndResetPosition(ms, ms.Position, cancellationToken);
         }
 
-        if (stream is ChunkedMemoryStream cms)
-        {
-            return PerformActionAndResetPosition(cms, cms.Position, cancellationToken);
-        }
-
         return CopyToMemoryStreamAndActionAsync(options, stream, PerformActionAndResetPosition, cancellationToken);
     }
 
@@ -282,9 +276,11 @@ private static async Task<T> CopyToMemoryStreamAndActionAsync<T>(
     {
         long position = stream.CanSeek ? stream.Position : 0;
         Configuration configuration = options.Configuration;
-        await using ChunkedMemoryStream memoryStream = new(configuration.MemoryAllocator);
+
+        await using MemoryStream memoryStream = new();
         await stream.CopyToAsync(memoryStream, configuration.StreamProcessingBufferSize, cancellationToken).ConfigureAwait(false);
         memoryStream.Position = 0;
+
         return await action(memoryStream, position, cancellationToken).ConfigureAwait(false);
     }
 

src/ImageSharp/Formats/ImageEncoder.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Formats;
@@ -48,8 +47,8 @@ private void EncodeWithSeekableStream<TPixel>(Image<TPixel> image, Stream stream
         }
         else
         {
-            using ChunkedMemoryStream ms = new(configuration.MemoryAllocator);
-            this.Encode(image, stream, cancellationToken);
+            using MemoryStream ms = new();
+            this.Encode(image, ms, cancellationToken);
             ms.Position = 0;
             ms.CopyTo(stream, configuration.StreamProcessingBufferSize);
         }
@@ -65,7 +64,7 @@ private async Task EncodeWithSeekableStreamAsync<TPixel>(Image<TPixel> image, St
         }
         else
         {
-            using ChunkedMemoryStream ms = new(configuration.MemoryAllocator);
+            await using MemoryStream ms = new();
             await DoEncodeAsync(ms);
             ms.Position = 0;
             await ms.CopyToAsync(stream, configuration.StreamProcessingBufferSize, cancellationToken)