diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/IccProfileConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/IccProfileConverter.cs index 632ffa4f05..66ec0b4340 100644 --- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/IccProfileConverter.cs +++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/IccProfileConverter.cs @@ -37,7 +37,7 @@ internal static class IccProfileConverter { IccDataToPcsConverter converterDataToPcs = new(inputIccProfile); IccPcsToDataConverter converterPcsToData = new(outputIccProfile); - Configuration configuration = image.GetConfiguration(); + Configuration configuration = image.Configuration; image.ProcessPixelRows(accessor => { diff --git a/src/ImageSharp/Metadata/Profiles/ICC/Various/IccClut.cs b/src/ImageSharp/Metadata/Profiles/ICC/Various/IccClut.cs index 546da28767..bbec7ce43e 100644 --- a/src/ImageSharp/Metadata/Profiles/ICC/Various/IccClut.cs +++ b/src/ImageSharp/Metadata/Profiles/ICC/Various/IccClut.cs @@ -113,7 +113,7 @@ internal sealed class IccClut : IEquatable length += (int)Math.Pow(this.GridPointCount[i], this.InputChannelCount); } - // TODO: Disabled this check, not sure if this check is correct. + // TODO: Disabled this check, not sure if this check is correct. // Guard.IsTrue(this.Values.Length == length, nameof(this.Values), "Length of values array does not match the grid points"); } } diff --git a/tests/ImageSharp.Tests/Colorspaces/Icc/Calculators/CurveCalculatorTests.cs b/tests/ImageSharp.Tests/Colorspaces/Icc/Calculators/CurveCalculatorTests.cs index 65d41f2df6..7e8e49d47f 100644 --- a/tests/ImageSharp.Tests/Colorspaces/Icc/Calculators/CurveCalculatorTests.cs +++ b/tests/ImageSharp.Tests/Colorspaces/Icc/Calculators/CurveCalculatorTests.cs @@ -5,23 +5,22 @@ using SixLabors.ImageSharp.ColorSpaces.Conversion.Icc; using SixLabors.ImageSharp.Metadata.Profiles.Icc; using SixLabors.ImageSharp.Tests.TestDataIcc.Conversion; -namespace SixLabors.ImageSharp.Tests.Colorspaces.Icc.Calculators +namespace SixLabors.ImageSharp.Tests.Colorspaces.Icc.Calculators; + +/// +/// Tests ICC +/// +[Trait("Color", "Conversion")] +public class CurveCalculatorTests { - /// - /// Tests ICC - /// - [Trait("Color", "Conversion")] - public class CurveCalculatorTests + [Theory] + [MemberData(nameof(IccConversionDataTrc.CurveConversionTestData), MemberType = typeof(IccConversionDataTrc))] + internal void CurveCalculator_WithCurveEntry_ReturnsResult(IccCurveTagDataEntry curve, bool inverted, float input, float expected) { - [Theory] - [MemberData(nameof(IccConversionDataTrc.CurveConversionTestData), MemberType = typeof(IccConversionDataTrc))] - internal void CurveCalculator_WithCurveEntry_ReturnsResult(IccCurveTagDataEntry curve, bool inverted, float input, float expected) - { - CurveCalculator calculator = new(curve, inverted); + CurveCalculator calculator = new(curve, inverted); - float result = calculator.Calculate(input); + float result = calculator.Calculate(input); - Assert.Equal(expected, result, 4); - } + Assert.Equal(expected, result, 4f); } } diff --git a/tests/ImageSharp.Tests/Colorspaces/Icc/Calculators/LutCalculatorTests.cs b/tests/ImageSharp.Tests/Colorspaces/Icc/Calculators/LutCalculatorTests.cs index 2c6317d605..bce04cf709 100644 --- a/tests/ImageSharp.Tests/Colorspaces/Icc/Calculators/LutCalculatorTests.cs +++ b/tests/ImageSharp.Tests/Colorspaces/Icc/Calculators/LutCalculatorTests.cs @@ -20,7 +20,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces.Icc.Calculators float result = calculator.Calculate(input); - Assert.Equal(expected, result, 4); + Assert.Equal(expected, result, 4f); } } } diff --git a/tests/ImageSharp.Tests/Colorspaces/Icc/Calculators/ParametricCurveCalculatorTests.cs b/tests/ImageSharp.Tests/Colorspaces/Icc/Calculators/ParametricCurveCalculatorTests.cs index c2387613c9..5a7511ba06 100644 --- a/tests/ImageSharp.Tests/Colorspaces/Icc/Calculators/ParametricCurveCalculatorTests.cs +++ b/tests/ImageSharp.Tests/Colorspaces/Icc/Calculators/ParametricCurveCalculatorTests.cs @@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces.Icc.Calculators float result = calculator.Calculate(input); - Assert.Equal(expected, result, 4); + Assert.Equal(expected, result, 4f); } } }