From 0c766a64c492798c1067233deb40f4be7c931d2b Mon Sep 17 00:00:00 2001 From: Dmitry Pentin Date: Tue, 10 May 2022 21:47:53 +0300 Subject: [PATCH] Small fixes --- .../Formats/Jpeg/Components/Encoder/HuffmanScanEncoder.cs | 4 ---- .../Formats/Jpeg/Components/Encoder/JpegComponent.cs | 2 +- src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs | 2 ++ 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/ImageSharp/Formats/Jpeg/Components/Encoder/HuffmanScanEncoder.cs b/src/ImageSharp/Formats/Jpeg/Components/Encoder/HuffmanScanEncoder.cs index 6e81e3a9a6..d271287bca 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Encoder/HuffmanScanEncoder.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Encoder/HuffmanScanEncoder.cs @@ -138,10 +138,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Encoder public void EncodeScanBaselineInterleaved(JpegFrame frame, SpectralConverter converter, CancellationToken cancellationToken) where TPixel : unmanaged, IPixel { - // DEBUG INITIALIZATION SETUP - frame.AllocateComponents(fullScan: false); - - // DEBUG ENCODING SETUP int mcu = 0; int mcusPerColumn = frame.McusPerColumn; int mcusPerLine = frame.McusPerLine; diff --git a/src/ImageSharp/Formats/Jpeg/Components/Encoder/JpegComponent.cs b/src/ImageSharp/Formats/Jpeg/Components/Encoder/JpegComponent.cs index 65425c05c1..49c7d4257e 100644 --- a/src/ImageSharp/Formats/Jpeg/Components/Encoder/JpegComponent.cs +++ b/src/ImageSharp/Formats/Jpeg/Components/Encoder/JpegComponent.cs @@ -107,7 +107,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Encoder int spectralAllocWidth = this.SizeInBlocks.Width; int spectralAllocHeight = fullScan ? this.SizeInBlocks.Height : this.VerticalSamplingFactor; - this.SpectralBlocks = this.memoryAllocator.Allocate2D(spectralAllocWidth, spectralAllocHeight, AllocationOptions.Clean); + this.SpectralBlocks = this.memoryAllocator.Allocate2D(spectralAllocWidth, spectralAllocHeight); } } } diff --git a/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs index ccdac68f18..4318f9e09c 100644 --- a/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs +++ b/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs @@ -126,6 +126,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg var spectralConverter = new SpectralConverter(frame, image, this.QuantizationTables, Configuration.Default); + // TODO: change this for non-interleaved scans + frame.AllocateComponents(fullScan: false); if (frame.ComponentCount > 1) { this.scanEncoder.EncodeScanBaselineInterleaved(frame, spectralConverter, cancellationToken);