From 194f6e022a49a8a5316bc8d86918c625c7792894 Mon Sep 17 00:00:00 2001 From: Dmitry Pentin Date: Mon, 12 Jul 2021 21:31:44 +0300 Subject: [PATCH] Debug converter no longer use actual converter --- .../Formats/Jpg/SpectralJpegTests.cs | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs index 197d18940f..b694808b76 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs @@ -84,7 +84,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg using var bufferedStream = new BufferedReadStream(Configuration.Default, ms); // internal scan decoder which we substitute to assert spectral correctness - using var debugConverter = new DebugSpectralConverter(Configuration.Default, cancellationToken: default); + var debugConverter = new DebugSpectralConverter(); var scanDecoder = new HuffmanScanDecoder(bufferedStream, debugConverter, cancellationToken: default); // This would parse entire image @@ -147,9 +147,6 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg private int baselineScanRowCounter; - public DebugSpectralConverter(Configuration configuration, CancellationToken cancellationToken) - => this.converter = new SpectralConverter(configuration, cancellationToken); - public LibJpegTools.SpectralData SpectralData { get @@ -171,8 +168,6 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg public override void ConvertStrideBaseline() { - this.converter.ConvertStrideBaseline(); - // This would be called only for baseline non-interleaved images // We must copy spectral strides here LibJpegTools.ComponentData[] components = this.spectralData.Components; @@ -180,23 +175,12 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg { components[i].LoadSpectralStride(this.frame.Components[i].SpectralBlocks, this.baselineScanRowCounter); } - this.baselineScanRowCounter++; - } - public override void Dispose() - { - // As we are only testing spectral data we don't care about pixels - // But we need to dispose allocated pixel buffer - this.converter.PixelBuffer.Dispose(); - - // Converter Dispose must be called after pixel buffer disposal because pixel buffer getter can do a full scan conversion - this.converter?.Dispose(); + this.baselineScanRowCounter++; } public override void InjectFrameData(JpegFrame frame, IRawJpegData jpegData) { - this.converter.InjectFrameData(frame, jpegData); - this.frame = frame; var spectralComponents = new LibJpegTools.ComponentData[frame.ComponentCount];