Skip to content

Commit 310fefd

Browse files
committed
Make GetColorConverter() virtual
1 parent bb539aa commit 310fefd

File tree

5 files changed

+3
-12
lines changed

5 files changed

+3
-12
lines changed

src/ImageSharp/Formats/Jpeg/Components/Decoder/SpectralConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ internal abstract class SpectralConverter
3939
/// <param name="frame">The jpeg frame with the color space to convert to.</param>
4040
/// <param name="jpegData">The raw JPEG data.</param>
4141
/// <returns>The color converter.</returns>
42-
public abstract JpegColorConverter GetConverter(JpegFrame frame, IRawJpegData jpegData);
42+
public virtual JpegColorConverter GetColorConverter(JpegFrame frame, IRawJpegData jpegData) => JpegColorConverter.GetConverter(jpegData.ColorSpace, frame.Precision);
4343
}
4444
}

src/ImageSharp/Formats/Jpeg/Components/Decoder/SpectralConverter{TPixel}.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public override void InjectFrameData(JpegFrame frame, IRawJpegData jpegData)
8686
this.rgbaBuffer = allocator.Allocate<Vector4>(frame.PixelWidth);
8787

8888
// color converter from Rgba32 to TPixel
89-
this.colorConverter = this.GetConverter(frame, jpegData);
89+
this.colorConverter = this.GetColorConverter(frame, jpegData);
9090
}
9191

9292
/// <inheritdoc/>
@@ -105,9 +105,6 @@ public override void ConvertStrideBaseline()
105105
}
106106
}
107107

108-
/// <inheritdoc/>
109-
public override JpegColorConverter GetConverter(JpegFrame frame, IRawJpegData jpegData) => JpegColorConverter.GetConverter(jpegData.ColorSpace, frame.Precision);
110-
111108
public void Dispose()
112109
{
113110
if (this.componentProcessors != null)

src/ImageSharp/Formats/Tiff/Compression/Decompressors/RgbJpegSpectralConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ public RgbJpegSpectralConverter(Configuration configuration, CancellationToken c
2828
}
2929

3030
/// <inheritdoc/>
31-
public override JpegColorConverter GetConverter(JpegFrame frame, IRawJpegData jpegData) => JpegColorConverter.GetConverter(JpegColorSpace.RGB, frame.Precision);
31+
public override JpegColorConverter GetColorConverter(JpegFrame frame, IRawJpegData jpegData) => JpegColorConverter.GetConverter(JpegColorSpace.RGB, frame.Precision);
3232
}
3333
}

tests/ImageSharp.Benchmarks/Codecs/Jpeg/DecodeJpegParseStreamOnly.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using BenchmarkDotNet.Attributes;
66
using SixLabors.ImageSharp.Formats.Jpeg;
77
using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
8-
using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters;
98
using SixLabors.ImageSharp.IO;
109
using SixLabors.ImageSharp.Tests;
1110
using SDSize = System.Drawing.Size;
@@ -59,8 +58,6 @@ public override void ConvertStrideBaseline()
5958
public override void InjectFrameData(JpegFrame frame, IRawJpegData jpegData)
6059
{
6160
}
62-
63-
public override JpegColorConverter GetConverter(JpegFrame frame, IRawJpegData jpegData) => JpegColorConverter.GetConverter(jpegData.ColorSpace, frame.Precision);
6461
}
6562
}
6663
}

tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using SixLabors.ImageSharp.Formats.Jpeg;
88
using SixLabors.ImageSharp.Formats.Jpeg.Components;
99
using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
10-
using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters;
1110
using SixLabors.ImageSharp.IO;
1211
using SixLabors.ImageSharp.Memory;
1312
using SixLabors.ImageSharp.PixelFormats;
@@ -201,8 +200,6 @@ public override void InjectFrameData(JpegFrame frame, IRawJpegData jpegData)
201200

202201
this.spectralData = new LibJpegTools.SpectralData(spectralComponents);
203202
}
204-
205-
public override JpegColorConverter GetConverter(JpegFrame frame, IRawJpegData jpegData) => JpegColorConverter.GetConverter(jpegData.ColorSpace, frame.Precision);
206203
}
207204
}
208205
}

0 commit comments

Comments
 (0)