Browse Source
Merge pull request #1974 from br3aker/dp/jpeg-tests-leak-fix
Fixed IDisposable leaks in jpeg decoder test suite.
pull/1977/head
James Jackson-South
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
4 additions and
5 deletions
-
tests/ImageSharp.Benchmarks/Codecs/Jpeg/DecodeJpegParseStreamOnly.cs
-
tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs
-
tests/ImageSharp.Tests/Formats/Jpg/SpectralToPixelConversionTests.cs
|
|
|
@ -39,10 +39,9 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg |
|
|
|
using var memoryStream = new MemoryStream(this.jpegBytes); |
|
|
|
using var bufferedStream = new BufferedReadStream(Configuration.Default, memoryStream); |
|
|
|
|
|
|
|
var decoder = new JpegDecoderCore(Configuration.Default, new JpegDecoder { IgnoreMetadata = true }); |
|
|
|
using var decoder = new JpegDecoderCore(Configuration.Default, new JpegDecoder { IgnoreMetadata = true }); |
|
|
|
var scanDecoder = new HuffmanScanDecoder(bufferedStream, new NoopSpectralConverter(), cancellationToken: default); |
|
|
|
decoder.ParseStream(bufferedStream, scanDecoder, cancellationToken: default); |
|
|
|
decoder.Dispose(); |
|
|
|
} |
|
|
|
|
|
|
|
// We want to test only stream parsing and scan decoding, we don't need to convert spectral data to actual pixels
|
|
|
|
|
|
|
|
@ -50,7 +50,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg |
|
|
|
// Calculating data from ImageSharp
|
|
|
|
byte[] sourceBytes = TestFile.Create(provider.SourceFileOrDescription).Bytes; |
|
|
|
|
|
|
|
var decoder = new JpegDecoderCore(Configuration.Default, new JpegDecoder()); |
|
|
|
using var decoder = new JpegDecoderCore(Configuration.Default, new JpegDecoder()); |
|
|
|
using var ms = new MemoryStream(sourceBytes); |
|
|
|
using var bufferedStream = new BufferedReadStream(Configuration.Default, ms); |
|
|
|
|
|
|
|
@ -79,7 +79,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg |
|
|
|
// Calculating data from ImageSharp
|
|
|
|
byte[] sourceBytes = TestFile.Create(provider.SourceFileOrDescription).Bytes; |
|
|
|
|
|
|
|
var decoder = new JpegDecoderCore(Configuration.Default, new JpegDecoder()); |
|
|
|
using var decoder = new JpegDecoderCore(Configuration.Default, new JpegDecoder()); |
|
|
|
using var ms = new MemoryStream(sourceBytes); |
|
|
|
using var bufferedStream = new BufferedReadStream(Configuration.Default, ms); |
|
|
|
|
|
|
|
|
|
|
|
@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg |
|
|
|
|
|
|
|
// Decoding
|
|
|
|
using var converter = new SpectralConverter<TPixel>(Configuration.Default); |
|
|
|
var decoder = new JpegDecoderCore(Configuration.Default, new JpegDecoder()); |
|
|
|
using var decoder = new JpegDecoderCore(Configuration.Default, new JpegDecoder()); |
|
|
|
var scanDecoder = new HuffmanScanDecoder(bufferedStream, converter, cancellationToken: default); |
|
|
|
decoder.ParseStream(bufferedStream, scanDecoder, cancellationToken: default); |
|
|
|
|
|
|
|
|