Browse Source

Update RowOctet tests

pull/1554/head
James Jackson-South 5 years ago
parent
commit
91a5d4c031
  1. 15
      src/ImageSharp/Formats/Jpeg/Components/RowOctet.cs
  2. 7
      tests/ImageSharp.Tests/Formats/Jpg/GenericBlock8x8Tests.cs

15
src/ImageSharp/Formats/Jpeg/Components/RowOctet.cs

@ -24,21 +24,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components
private Span<T> row6;
private Span<T> row7;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public RowOctet(Buffer2D<T> buffer, int startY)
{
int y = startY;
int height = buffer.Height;
this.row0 = y < height ? buffer.GetRowSpan(y++) : default;
this.row1 = y < height ? buffer.GetRowSpan(y++) : default;
this.row2 = y < height ? buffer.GetRowSpan(y++) : default;
this.row3 = y < height ? buffer.GetRowSpan(y++) : default;
this.row4 = y < height ? buffer.GetRowSpan(y++) : default;
this.row5 = y < height ? buffer.GetRowSpan(y++) : default;
this.row6 = y < height ? buffer.GetRowSpan(y++) : default;
this.row7 = y < height ? buffer.GetRowSpan(y) : default;
}
// No unsafe tricks, since Span<T> can't be used as a generic argument
public Span<T> this[int y]
{

7
tests/ImageSharp.Tests/Formats/Jpg/GenericBlock8x8Tests.cs

@ -42,7 +42,8 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
using (Image<TPixel> s = provider.GetImage())
{
var d = default(GenericBlock8x8<TPixel>);
var rowOctet = new RowOctet<TPixel>(s.GetRootFramePixelBuffer(), 0);
RowOctet<TPixel> rowOctet = default;
rowOctet.Update(s.GetRootFramePixelBuffer(), 0);
d.LoadAndStretchEdges(s.Frames.RootFrame.PixelBuffer, 0, 0, ref rowOctet);
TPixel a = s.Frames.RootFrame[0, 0];
@ -67,7 +68,9 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
using (Image<TPixel> s = provider.GetImage())
{
var d = default(GenericBlock8x8<TPixel>);
var rowOctet = new RowOctet<TPixel>(s.GetRootFramePixelBuffer(), 7);
RowOctet<TPixel> rowOctet = default;
rowOctet.Update(s.GetRootFramePixelBuffer(), 7);
d.LoadAndStretchEdges(s.Frames.RootFrame.PixelBuffer, 6, 7, ref rowOctet);
Assert.Equal(s[6, 7], d[0, 0]);

Loading…
Cancel
Save