diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
index 53b4f9632..ddceaff1f 100644
--- a/tests/Directory.Build.targets
+++ b/tests/Directory.Build.targets
@@ -20,7 +20,7 @@
-
+
diff --git a/tests/ImageSharp.Benchmarks/Color/ColorspaceCieXyzToCieLabConvert.cs b/tests/ImageSharp.Benchmarks/Color/ColorspaceCieXyzToCieLabConvert.cs
index 914041e5b..fcb3daf3b 100644
--- a/tests/ImageSharp.Benchmarks/Color/ColorspaceCieXyzToCieLabConvert.cs
+++ b/tests/ImageSharp.Benchmarks/Color/ColorspaceCieXyzToCieLabConvert.cs
@@ -4,10 +4,10 @@
using BenchmarkDotNet.Attributes;
using Colourful;
-using Colourful.Conversion;
using SixLabors.ImageSharp.ColorSpaces;
using SixLabors.ImageSharp.ColorSpaces.Conversion;
+using Illuminants = Colourful.Illuminants;
namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces
{
@@ -19,12 +19,12 @@ namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces
private static readonly ColorSpaceConverter ColorSpaceConverter = new ColorSpaceConverter();
- private static readonly ColourfulConverter ColourfulConverter = new ColourfulConverter();
+ private static readonly IColorConverter ColourfulConverter = new ConverterBuilder().FromXYZ(Illuminants.D50).ToLab(Illuminants.D50).Build();
[Benchmark(Baseline = true, Description = "Colourful Convert")]
public double ColourfulConvert()
{
- return ColourfulConverter.ToLab(XYZColor).L;
+ return ColourfulConverter.Convert(XYZColor).L;
}
[Benchmark(Description = "ImageSharp Convert")]
diff --git a/tests/ImageSharp.Benchmarks/Color/ColorspaceCieXyzToHunterLabConvert.cs b/tests/ImageSharp.Benchmarks/Color/ColorspaceCieXyzToHunterLabConvert.cs
index c6f4c0471..afba44e73 100644
--- a/tests/ImageSharp.Benchmarks/Color/ColorspaceCieXyzToHunterLabConvert.cs
+++ b/tests/ImageSharp.Benchmarks/Color/ColorspaceCieXyzToHunterLabConvert.cs
@@ -4,10 +4,10 @@
using BenchmarkDotNet.Attributes;
using Colourful;
-using Colourful.Conversion;
using SixLabors.ImageSharp.ColorSpaces;
using SixLabors.ImageSharp.ColorSpaces.Conversion;
+using Illuminants = Colourful.Illuminants;
namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces
{
@@ -19,12 +19,12 @@ namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces
private static readonly ColorSpaceConverter ColorSpaceConverter = new ColorSpaceConverter();
- private static readonly ColourfulConverter ColourfulConverter = new ColourfulConverter();
+ private static readonly IColorConverter ColourfulConverter = new ConverterBuilder().FromXYZ(Illuminants.C).ToHunterLab(Illuminants.C).Build();
[Benchmark(Baseline = true, Description = "Colourful Convert")]
public double ColourfulConvert()
{
- return ColourfulConverter.ToHunterLab(XYZColor).L;
+ return ColourfulConverter.Convert(XYZColor).L;
}
[Benchmark(Description = "ImageSharp Convert")]
diff --git a/tests/ImageSharp.Benchmarks/Color/ColorspaceCieXyzToLmsConvert.cs b/tests/ImageSharp.Benchmarks/Color/ColorspaceCieXyzToLmsConvert.cs
index c7f78bb08..eddc1a680 100644
--- a/tests/ImageSharp.Benchmarks/Color/ColorspaceCieXyzToLmsConvert.cs
+++ b/tests/ImageSharp.Benchmarks/Color/ColorspaceCieXyzToLmsConvert.cs
@@ -4,7 +4,6 @@
using BenchmarkDotNet.Attributes;
using Colourful;
-using Colourful.Conversion;
using SixLabors.ImageSharp.ColorSpaces;
using SixLabors.ImageSharp.ColorSpaces.Conversion;
@@ -19,12 +18,12 @@ namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces
private static readonly ColorSpaceConverter ColorSpaceConverter = new ColorSpaceConverter();
- private static readonly ColourfulConverter ColourfulConverter = new ColourfulConverter();
+ private static readonly IColorConverter ColourfulConverter = new ConverterBuilder().FromXYZ().ToLMS().Build();
[Benchmark(Baseline = true, Description = "Colourful Convert")]
public double ColourfulConvert()
{
- return ColourfulConverter.ToLMS(XYZColor).L;
+ return ColourfulConverter.Convert(XYZColor).L;
}
[Benchmark(Description = "ImageSharp Convert")]
diff --git a/tests/ImageSharp.Benchmarks/Color/ColorspaceCieXyzToRgbConvert.cs b/tests/ImageSharp.Benchmarks/Color/ColorspaceCieXyzToRgbConvert.cs
index 18494f3f6..b56e55b1e 100644
--- a/tests/ImageSharp.Benchmarks/Color/ColorspaceCieXyzToRgbConvert.cs
+++ b/tests/ImageSharp.Benchmarks/Color/ColorspaceCieXyzToRgbConvert.cs
@@ -4,7 +4,6 @@
using BenchmarkDotNet.Attributes;
using Colourful;
-using Colourful.Conversion;
using SixLabors.ImageSharp.ColorSpaces;
using SixLabors.ImageSharp.ColorSpaces.Conversion;
@@ -19,12 +18,12 @@ namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces
private static readonly ColorSpaceConverter ColorSpaceConverter = new ColorSpaceConverter();
- private static readonly ColourfulConverter ColourfulConverter = new ColourfulConverter();
+ private static readonly IColorConverter ColourfulConverter = new ConverterBuilder().FromXYZ(RGBWorkingSpaces.sRGB.WhitePoint).ToRGB(RGBWorkingSpaces.sRGB).Build();
[Benchmark(Baseline = true, Description = "Colourful Convert")]
public double ColourfulConvert()
{
- return ColourfulConverter.ToRGB(XYZColor).R;
+ return ColourfulConverter.Convert(XYZColor).R;
}
[Benchmark(Description = "ImageSharp Convert")]
diff --git a/tests/ImageSharp.Benchmarks/Color/RgbWorkingSpaceAdapt.cs b/tests/ImageSharp.Benchmarks/Color/RgbWorkingSpaceAdapt.cs
index 21cf10bb7..d42b22ecb 100644
--- a/tests/ImageSharp.Benchmarks/Color/RgbWorkingSpaceAdapt.cs
+++ b/tests/ImageSharp.Benchmarks/Color/RgbWorkingSpaceAdapt.cs
@@ -4,7 +4,6 @@
using BenchmarkDotNet.Attributes;
using Colourful;
-using Colourful.Conversion;
using SixLabors.ImageSharp.ColorSpaces;
using SixLabors.ImageSharp.ColorSpaces.Conversion;
@@ -15,20 +14,20 @@ namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces
{
private static readonly Rgb Rgb = new Rgb(0.206162F, 0.260277F, 0.746717F, RgbWorkingSpaces.WideGamutRgb);
- private static readonly RGBColor RGBColor = new RGBColor(0.206162, 0.260277, 0.746717, RGBWorkingSpaces.WideGamutRGB);
+ private static readonly RGBColor RGBColor = new RGBColor(0.206162, 0.260277, 0.746717);
private static readonly ColorSpaceConverter ColorSpaceConverter = new ColorSpaceConverter(new ColorSpaceConverterOptions { TargetRgbWorkingSpace = RgbWorkingSpaces.SRgb });
- private static readonly ColourfulConverter ColourfulConverter = new ColourfulConverter { TargetRGBWorkingSpace = RGBWorkingSpaces.sRGB };
+ private static readonly IColorConverter ColourfulConverter = new ConverterBuilder().FromRGB(RGBWorkingSpaces.WideGamutRGB).ToRGB(RGBWorkingSpaces.sRGB).Build();
[Benchmark(Baseline = true, Description = "Colourful Adapt")]
public RGBColor ColourfulConvert()
{
- return ColourfulConverter.Adapt(RGBColor);
+ return ColourfulConverter.Convert(RGBColor);
}
[Benchmark(Description = "ImageSharp Adapt")]
- internal Rgb ColorSpaceConvert()
+ public Rgb ColorSpaceConvert()
{
return ColorSpaceConverter.Adapt(Rgb);
}