Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rewrite ChunkedMemoryStream #2828

Merged
merged 11 commits into from
Nov 13, 2024
Merged

Rewrite ChunkedMemoryStream #2828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1e58db2
Remove ChunkedMemoryStream
JimBobSquarePants Oct 22, 2024
1a15078
Update BufferedStreams.cs
JimBobSquarePants Oct 22, 2024
ee53532
Merge branch 'release/3.1.x' into js/issue-2806
JimBobSquarePants Oct 22, 2024
c418bb0
Revert "Remove ChunkedMemoryStream"
JimBobSquarePants Oct 22, 2024
48645f8
Rewrite ChunkedMemoryStream
JimBobSquarePants Oct 23, 2024
f96f8ca
Revert "Update BufferedStreams.cs"
JimBobSquarePants Oct 23, 2024
03343c4
Simplify and optimize position checking
JimBobSquarePants Oct 23, 2024
b74d2e4
Add WriteByte and optimize ReadByte
JimBobSquarePants Oct 29, 2024
6301662
Feedback updates and massively expand write tests
JimBobSquarePants Nov 4, 2024
c45702d
Fix read bug.
JimBobSquarePants Nov 4, 2024
c4fd666
Update tests/ImageSharp.Tests/IO/ChunkedMemoryStreamTests.cs
JimBobSquarePants Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ImageSharp/Formats/ImageEncoder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ private void EncodeWithSeekableStream<TPixel>(Image<TPixel> image, Stream stream
else
{
using ChunkedMemoryStream ms = new(configuration.MemoryAllocator);
this.Encode(image, stream, cancellationToken);
this.Encode(image, ms, cancellationToken);
ms.Position = 0;
ms.CopyTo(stream, configuration.StreamProcessingBufferSize);
}
Expand All @@ -65,7 +65,7 @@ private async Task EncodeWithSeekableStreamAsync<TPixel>(Image<TPixel> image, St
}
else
{
using ChunkedMemoryStream ms = new(configuration.MemoryAllocator);
await using ChunkedMemoryStream ms = new(configuration.MemoryAllocator);
await DoEncodeAsync(ms);
ms.Position = 0;
await ms.CopyToAsync(stream, configuration.StreamProcessingBufferSize, cancellationToken)
Expand Down
Loading
Loading