tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

add (failing) tests from #847

pull/869/head
Anton Firszov 7 years ago
parent
b0ff7cf6b6
commit
d126b8591e
2 changed files with 280 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      tests/ImageSharp.Tests/PixelFormats/PixelOperations/PixelOperationsTests.Rgb24OperationsTests.cs
  2. 270
      tests/ImageSharp.Tests/PixelFormats/PixelOperations/PixelOperationsTests.cs

23
tests/ImageSharp.Tests/PixelFormats/PixelOperations/PixelOperationsTests.Rgb24OperationsTests.cs
View File

@ -0,0 +1,23 @@
// Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0.
using SixLabors.ImageSharp.PixelFormats;
using Xunit;
using Xunit.Abstractions;
namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelOperations
{
public partial class PixelOperationsTests
{
public class Rgb24OperationsTests : PixelOperationsTests<Rgb24>
{
public Rgb24OperationsTests(ITestOutputHelper output)
: base(output)
{
}
[Fact]
public void IsSpecialImplementation() => Assert.IsType<Rgb24.PixelOperations>(PixelOperations<Rgb24>.Instance);
}
}
}

270
tests/ImageSharp.Tests/PixelFormats/PixelOperations/PixelOperationsTests.cs
View File

@ -6,7 +6,7 @@ using System.Buffers;
using System.Numerics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using SixLabors.ImageSharp.ColorSpaces.Companding;
using SixLabors.ImageSharp.Memory;
using SixLabors.ImageSharp.PixelFormats;
@ -70,25 +70,33 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelOperations
internal static PixelOperations<TPixel> Operations => PixelOperations<TPixel>.Instance;
internal static TPixel[] CreateExpectedPixelData(Vector4[] source)
internal static TPixel[] CreateExpectedPixelData(Vector4[] source, RefAction<Vector4> vectorModifier = null)
{
var expected = new TPixel[source.Length];
for (int i = 0; i < expected.Length; i++)
{
expected[i].FromVector4(source[i]);
Vector4 v = source[i];
vectorModifier?.Invoke(ref v);
expected[i].FromVector4(v);
}
return expected;
}
internal static TPixel[] CreateScaledExpectedPixelData(Vector4[] source)
internal static TPixel[] CreateScaledExpectedPixelData(Vector4[] source, RefAction<Vector4> vectorModifier = null)
{
var expected = new TPixel[source.Length];
for (int i = 0; i < expected.Length; i++)
{
expected[i].FromScaledVector4(source[i]);
Vector4 v = source[i];
vectorModifier?.Invoke(ref v);
expected[i].FromScaledVector4(v);
}
return expected;
}
@ -120,6 +128,112 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelOperations
);
}
[Theory]
[MemberData(nameof(ArraySizesData))]
public void FromCompandedScaledVector4(int count)
{
void sourceAction(ref Vector4 v)
{
SRgbCompanding.Expand(ref v);
}
void expectedAction(ref Vector4 v)
{
SRgbCompanding.Compress(ref v);
}
Vector4[] source = CreateVector4TestData(count, (ref Vector4 v) => sourceAction(ref v));
TPixel[] expected = CreateScaledExpectedPixelData(source, (ref Vector4 v) => expectedAction(ref v));
TestOperation(
source,
expected,
(s, d) => Operations.FromVector4(this.Configuration, s, d.GetSpan(), PixelConversionModifiers.SRgbCompand | PixelConversionModifiers.Scale)
);
}
[Theory]
[MemberData(nameof(ArraySizesData))]
public void FromPremultipliedVector4(int count)
{
void sourceAction(ref Vector4 v)
{
Vector4Utils.Premultiply(ref v);
}
void expectedAction(ref Vector4 v)
{
Vector4Utils.UnPremultiply(ref v);
}
Vector4[] source = CreateVector4TestData(count, (ref Vector4 v) => sourceAction(ref v));
TPixel[] expected = CreateExpectedPixelData(source, (ref Vector4 v) => expectedAction(ref v));
TestOperation(
source,
expected,
(s, d) => Operations.FromVector4(this.Configuration, s, d.GetSpan(), PixelConversionModifiers.Premultiply)
);
}
[Theory]
[MemberData(nameof(ArraySizesData))]
public void FromPremultipliedScaledVector4(int count)
{
void sourceAction(ref Vector4 v)
{
Vector4Utils.Premultiply(ref v);
}
void expectedAction(ref Vector4 v)
{
Vector4Utils.UnPremultiply(ref v);
}
Vector4[] source = CreateVector4TestData(count, (ref Vector4 v) => sourceAction(ref v));
TPixel[] expected = CreateScaledExpectedPixelData(source, (ref Vector4 v) => expectedAction(ref v));
TestOperation(
source,
expected,
(s, d) => Operations.FromVector4(
this.Configuration,
s,
d.GetSpan(),
PixelConversionModifiers.Premultiply | PixelConversionModifiers.Scale)
);
}
[Theory]
[MemberData(nameof(ArraySizesData))]
public void FromCompandedPremultipliedScaledVector4(int count)
{
void sourceAction(ref Vector4 v)
{
SRgbCompanding.Expand(ref v);
Vector4Utils.Premultiply(ref v);
}
void expectedAction(ref Vector4 v)
{
Vector4Utils.UnPremultiply(ref v);
SRgbCompanding.Compress(ref v);
}
Vector4[] source = CreateVector4TestData(count, (ref Vector4 v) => sourceAction(ref v));
TPixel[] expected = CreateScaledExpectedPixelData(source, (ref Vector4 v) => expectedAction(ref v));
TestOperation(
source,
expected,
(s, d) => Operations.FromVector4(
this.Configuration,
s,
d.GetSpan(),
PixelConversionModifiers.SRgbCompand | PixelConversionModifiers.Premultiply)
);
}
[Theory]
[MemberData(nameof(ArraySizesData))]
public void ToVector4(int count)
@ -148,6 +262,115 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelOperations
);
}
[Theory]
[MemberData(nameof(ArraySizesData))]
public void ToCompandedScaledVector4(int count)
{
void sourceAction(ref Vector4 v)
{
SRgbCompanding.Compress(ref v);
}
void expectedAction(ref Vector4 v)
{
SRgbCompanding.Expand(ref v);
}
TPixel[] source = CreateScaledPixelTestData(count, (ref Vector4 v) => sourceAction(ref v));
Vector4[] expected = CreateExpectedScaledVector4Data(source, (ref Vector4 v) => expectedAction(ref v));
TestOperation(
source,
expected,
(s, d) => Operations.ToVector4(
this.Configuration,
s,
d.GetSpan(),
PixelConversionModifiers.SRgbCompand | PixelConversionModifiers.Scale)
);
}
[Theory]
[MemberData(nameof(ArraySizesData))]
public void ToPremultipliedVector4(int count)
{
void sourceAction(ref Vector4 v)
{
Vector4Utils.UnPremultiply(ref v);
}
void expectedAction(ref Vector4 v)
{
Vector4Utils.Premultiply(ref v);
}
TPixel[] source = CreatePixelTestData(count, (ref Vector4 v) => sourceAction(ref v));
Vector4[] expected = CreateExpectedVector4Data(source, (ref Vector4 v) => expectedAction(ref v));
TestOperation(
source,
expected,
(s, d) => Operations.ToVector4(this.Configuration, s, d.GetSpan(), PixelConversionModifiers.Premultiply)
);
}
[Theory]
[MemberData(nameof(ArraySizesData))]
public void ToPremultipliedScaledVector4(int count)
{
void sourceAction(ref Vector4 v)
{
Vector4Utils.UnPremultiply(ref v);
}
void expectedAction(ref Vector4 v)
{
Vector4Utils.Premultiply(ref v);
}
TPixel[] source = CreateScaledPixelTestData(count, (ref Vector4 v) => sourceAction(ref v));
Vector4[] expected = CreateExpectedScaledVector4Data(source, (ref Vector4 v) => expectedAction(ref v));
TestOperation(
source,
expected,
(s, d) => Operations.ToVector4(
this.Configuration,
s,
d.GetSpan(),
PixelConversionModifiers.Premultiply | PixelConversionModifiers.Scale));
}
[Theory]
[MemberData(nameof(ArraySizesData))]
public void ToCompandedPremultipliedScaledVector4(int count)
{
void sourceAction(ref Vector4 v)
{
Vector4Utils.UnPremultiply(ref v);
SRgbCompanding.Compress(ref v);
}
void expectedAction(ref Vector4 v)
{
SRgbCompanding.Expand(ref v);
Vector4Utils.Premultiply(ref v);
}
TPixel[] source = CreateScaledPixelTestData(count, (ref Vector4 v) => sourceAction(ref v));
Vector4[] expected = CreateExpectedScaledVector4Data(source, (ref Vector4 v) => expectedAction(ref v));
TestOperation(
source,
expected,
(s, d) => Operations.ToVector4(
this.Configuration,
s,
d.GetSpan(),
PixelConversionModifiers.SRgbCompand | PixelConversionModifiers.Premultiply | PixelConversionModifiers.Scale)
);
}
[Theory]
[MemberData(nameof(ArraySizesData))]
public void FromArgb32Bytes(int count)
@ -477,25 +700,37 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelOperations
);
}
internal static Vector4[] CreateExpectedVector4Data(TPixel[] source)
public delegate void RefAction<T1>(ref T1 arg1);
internal static Vector4[] CreateExpectedVector4Data(TPixel[] source, RefAction<Vector4> vectorModifier = null)
{
var expected = new Vector4[source.Length];
for (int i = 0; i < expected.Length; i++)
{
expected[i] = source[i].ToVector4();
var v = source[i].ToVector4();
vectorModifier?.Invoke(ref v);
expected[i] = v;
}
return expected;
}
internal static Vector4[] CreateExpectedScaledVector4Data(TPixel[] source)
internal static Vector4[] CreateExpectedScaledVector4Data(TPixel[] source, RefAction<Vector4> vectorModifier = null)
{
var expected = new Vector4[source.Length];
for (int i = 0; i < expected.Length; i++)
{
expected[i] = source[i].ToScaledVector4();
Vector4 v = source[i].ToScaledVector4();
vectorModifier?.Invoke(ref v);
expected[i] = v;
}
return expected;
}
@ -513,19 +748,22 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelOperations
}
}
internal static Vector4[] CreateVector4TestData(int length)
internal static Vector4[] CreateVector4TestData(int length, RefAction<Vector4> vectorModifier = null)
{
var result = new Vector4[length];
var rnd = new Random(42); // Deterministic random values
for (int i = 0; i < result.Length; i++)
{
result[i] = GetVector(rnd);
Vector4 v = GetVector(rnd);
vectorModifier?.Invoke(ref v);
result[i] = v;
}
return result;
}
internal static TPixel[] CreatePixelTestData(int length)
internal static TPixel[] CreatePixelTestData(int length, RefAction<Vector4> vectorModifier = null)
{
var result = new TPixel[length];
@ -534,13 +772,16 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelOperations
for (int i = 0; i < result.Length; i++)
{
Vector4 v = GetVector(rnd);
vectorModifier?.Invoke(ref v);
result[i].FromVector4(v);
}
return result;
}
internal static TPixel[] CreateScaledPixelTestData(int length)
internal static TPixel[] CreateScaledPixelTestData(int length, RefAction<Vector4> vectorModifier = null)
{
var result = new TPixel[length];
@ -549,6 +790,9 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelOperations
for (int i = 0; i < result.Length; i++)
{
Vector4 v = GetVector(rnd);
vectorModifier?.Invoke(ref v);
result[i].FromScaledVector4(v);
}

Write Preview
Loading…
Cancel
Save