Skip to content

Commit e707a8d

Browse files
JimBobSquarePantsJimBobSquarePants
committed
Minor fixes.
1 parent 5a4aea8 commit e707a8d

File tree

7 files changed

+24
-14
lines changed

7 files changed

+24
-14
lines changed

‎src/ImageSharp/Formats/Bmp/BmpDecoder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public Task<Image<TPixel>> DecodeAsync<TPixel>(Configuration configuration, Stre
5757
/// <inheritdoc />
5858
public async Task<Image> DecodeAsync(Configuration configuration, Stream stream, CancellationToken cancellationToken)
5959
=> await this.DecodeAsync<Rgba32>(configuration, stream, cancellationToken)
60-
.ConfigureAwait(false);
60+
.ConfigureAwait(false);
6161

6262
/// <inheritdoc/>
6363
public IImageInfo Identify(Configuration configuration, Stream stream)

‎src/ImageSharp/Formats/Gif/GifDecoder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public Task<Image<TPixel>> DecodeAsync<TPixel>(Configuration configuration, Stre
4949
/// <inheritdoc />
5050
public async Task<Image> DecodeAsync(Configuration configuration, Stream stream, CancellationToken cancellationToken)
5151
=> await this.DecodeAsync<Rgba32>(configuration, stream, cancellationToken)
52-
.ConfigureAwait(false);
52+
.ConfigureAwait(false);
5353

5454
/// <inheritdoc/>
5555
public IImageInfo Identify(Configuration configuration, Stream stream)

‎src/ImageSharp/Formats/ImageDecoderUtilities.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public static Task<IImageInfo> IdentifyAsync(
4848
{
4949
try
5050
{
51-
using BufferedReadStream bufferedReadStream = new BufferedReadStream(configuration, stream);
51+
using var bufferedReadStream = new BufferedReadStream(configuration, stream);
5252
IImageInfo imageInfo = decoder.Identify(bufferedReadStream, cancellationToken);
5353
return Task.FromResult(imageInfo);
5454
}
@@ -108,7 +108,7 @@ public static Task<Image<TPixel>> DecodeAsync<TPixel>(
108108
{
109109
try
110110
{
111-
using BufferedReadStream bufferedReadStream = new BufferedReadStream(configuration, stream);
111+
using var bufferedReadStream = new BufferedReadStream(configuration, stream);
112112
Image<TPixel> image = decoder.Decode<TPixel>(bufferedReadStream, cancellationToken);
113113
return Task.FromResult(image);
114114
}
@@ -132,7 +132,7 @@ public static IImageInfo Identify(
132132
Configuration configuration,
133133
Stream stream)
134134
{
135-
using BufferedReadStream bufferedReadStream = new BufferedReadStream(configuration, stream);
135+
using var bufferedReadStream = new BufferedReadStream(configuration, stream);
136136

137137
try
138138
{
@@ -155,7 +155,7 @@ public static Image<TPixel> Decode<TPixel>(
155155
Func<InvalidMemoryOperationException, Size, InvalidImageContentException> largeImageExceptionFactory)
156156
where TPixel : unmanaged, IPixel<TPixel>
157157
{
158-
using BufferedReadStream bufferedReadStream = new BufferedReadStream(configuration, stream);
158+
using var bufferedReadStream = new BufferedReadStream(configuration, stream);
159159

160160
try
161161
{

‎src/ImageSharp/Formats/Jpeg/JpegDecoder.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ public Task<Image<TPixel>> DecodeAsync<TPixel>(Configuration configuration, Stre
4444

4545
/// <inheritdoc />
4646
public async Task<Image> DecodeAsync(Configuration configuration, Stream stream, CancellationToken cancellationToken)
47-
=> await this.DecodeAsync<Rgba32>(configuration, stream, cancellationToken).ConfigureAwait(false);
47+
=> await this.DecodeAsync<Rgba32>(configuration, stream, cancellationToken)
48+
.ConfigureAwait(false);
4849

4950
/// <inheritdoc/>
5051
public IImageInfo Identify(Configuration configuration, Stream stream)
@@ -56,12 +57,18 @@ public IImageInfo Identify(Configuration configuration, Stream stream)
5657
}
5758

5859
/// <inheritdoc/>
59-
public Task<IImageInfo> IdentifyAsync(Configuration configuration, Stream stream, CancellationToken cancellationToken)
60+
public async Task<IImageInfo> IdentifyAsync(Configuration configuration, Stream stream, CancellationToken cancellationToken)
6061
{
6162
Guard.NotNull(stream, nameof(stream));
6263

63-
using var decoder = new JpegDecoderCore(configuration, this);
64-
return decoder.IdentifyAsync(configuration, stream, cancellationToken);
64+
// The introduction of a local variable that refers to an object the implements
65+
// IDisposable means you must use async/await, where the compiler generates the
66+
// state machine and a continuation.
67+
using (var decoder = new JpegDecoderCore(configuration, this))
68+
{
69+
return await decoder.IdentifyAsync(configuration, stream, cancellationToken)
70+
.ConfigureAwait(false);
71+
}
6572
}
6673
}
6774
}

‎src/ImageSharp/Formats/Png/PngDecoder.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
using System.IO;
55
using System.Threading;
66
using System.Threading.Tasks;
7-
using SixLabors.ImageSharp.IO;
8-
using SixLabors.ImageSharp.Memory;
97
using SixLabors.ImageSharp.PixelFormats;
108

119
namespace SixLabors.ImageSharp.Formats.Png
@@ -39,7 +37,8 @@ public Task<Image<TPixel>> DecodeAsync<TPixel>(Configuration configuration, Stre
3937

4038
/// <inheritdoc />
4139
public async Task<Image> DecodeAsync(Configuration configuration, Stream stream, CancellationToken cancellationToken)
42-
=> await this.DecodeAsync<Rgba32>(configuration, stream, cancellationToken);
40+
=> await this.DecodeAsync<Rgba32>(configuration, stream, cancellationToken)
41+
.ConfigureAwait(false);
4342

4443
/// <inheritdoc/>
4544
public IImageInfo Identify(Configuration configuration, Stream stream)

‎src/ImageSharp/Formats/Png/PngEncoder.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ public void Encode<TPixel>(Image<TPixel> image, Stream stream)
7777
public async Task EncodeAsync<TPixel>(Image<TPixel> image, Stream stream, CancellationToken cancellationToken)
7878
where TPixel : unmanaged, IPixel<TPixel>
7979
{
80+
// The introduction of a local variable that refers to an object the implements
81+
// IDisposable means you must use async/await, where the compiler generates the
82+
// state machine and a continuation.
8083
using (var encoder = new PngEncoderCore(image.GetMemoryAllocator(), image.GetConfiguration(), new PngEncoderOptions(this)))
8184
{
8285
await encoder.EncodeAsync(image, stream, cancellationToken).ConfigureAwait(false);

‎src/ImageSharp/Formats/Tga/TgaDecoder.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ public Task<Image<TPixel>> DecodeAsync<TPixel>(Configuration configuration, Stre
4141

4242
/// <inheritdoc />
4343
public async Task<Image> DecodeAsync(Configuration configuration, Stream stream, CancellationToken cancellationToken)
44-
=> await this.DecodeAsync<Rgba32>(configuration, stream, cancellationToken);
44+
=> await this.DecodeAsync<Rgba32>(configuration, stream, cancellationToken)
45+
.ConfigureAwait(false);
4546

4647
/// <inheritdoc/>
4748
public IImageInfo Identify(Configuration configuration, Stream stream)

0 commit comments

Comments
 (0)