Browse Source

Injected scan selectors count

pull/1694/head
Dmitry Pentin 5 years ago
parent
commit
336c64aab6
  1. 4
      src/ImageSharp/Formats/Jpeg/Components/Decoder/HuffmanScanDecoder.cs
  2. 3
      src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs

4
src/ImageSharp/Formats/Jpeg/Components/Decoder/HuffmanScanDecoder.cs

@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
private readonly int restartInterval; private readonly int restartInterval;
// The number of interleaved components. // The number of interleaved components.
private readonly int componentsLength; public int componentsLength;
// The spectral selection start. // The spectral selection start.
public int spectralStart; public int spectralStart;
@ -72,7 +72,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
JpegFrame frame, JpegFrame frame,
HuffmanTable[] dcHuffmanTables, HuffmanTable[] dcHuffmanTables,
HuffmanTable[] acHuffmanTables, HuffmanTable[] acHuffmanTables,
int componentsLength,
int restartInterval, int restartInterval,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
@ -83,7 +82,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
this.dcHuffmanTables = dcHuffmanTables; this.dcHuffmanTables = dcHuffmanTables;
this.acHuffmanTables = acHuffmanTables; this.acHuffmanTables = acHuffmanTables;
this.components = frame.Components; this.components = frame.Components;
this.componentsLength = componentsLength;
this.restartInterval = restartInterval; this.restartInterval = restartInterval;
this.todo = restartInterval; this.todo = restartInterval;
this.cancellationToken = cancellationToken; this.cancellationToken = cancellationToken;

3
src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs

@ -1054,10 +1054,11 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
this.Frame, this.Frame,
this.dcHuffmanTables, this.dcHuffmanTables,
this.acHuffmanTables, this.acHuffmanTables,
selectorsCount,
this.resetInterval, this.resetInterval,
cancellationToken) cancellationToken)
{ {
componentsLength = selectorsCount,
spectralStart = spectralStart, spectralStart = spectralStart,
spectralEnd = spectralEnd, spectralEnd = spectralEnd,
successiveHigh = successiveApproximation >> 4, successiveHigh = successiveApproximation >> 4,

Loading…
Cancel
Save