Browse Source

Fix build

pull/1567/head
James Jackson-South 3 years ago
parent
commit
c1ebbfedc1
  1. 2
      src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/IccProfileConverter.cs
  2. 2
      src/ImageSharp/Metadata/Profiles/ICC/Various/IccClut.cs
  3. 27
      tests/ImageSharp.Tests/Colorspaces/Icc/Calculators/CurveCalculatorTests.cs
  4. 2
      tests/ImageSharp.Tests/Colorspaces/Icc/Calculators/LutCalculatorTests.cs
  5. 2
      tests/ImageSharp.Tests/Colorspaces/Icc/Calculators/ParametricCurveCalculatorTests.cs

2
src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/IccProfileConverter.cs

@ -37,7 +37,7 @@ internal static class IccProfileConverter
{ {
IccDataToPcsConverter converterDataToPcs = new(inputIccProfile); IccDataToPcsConverter converterDataToPcs = new(inputIccProfile);
IccPcsToDataConverter converterPcsToData = new(outputIccProfile); IccPcsToDataConverter converterPcsToData = new(outputIccProfile);
Configuration configuration = image.GetConfiguration(); Configuration configuration = image.Configuration;
image.ProcessPixelRows(accessor => image.ProcessPixelRows(accessor =>
{ {

2
src/ImageSharp/Metadata/Profiles/ICC/Various/IccClut.cs

@ -113,7 +113,7 @@ internal sealed class IccClut : IEquatable<IccClut>
length += (int)Math.Pow(this.GridPointCount[i], this.InputChannelCount); 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"); // Guard.IsTrue(this.Values.Length == length, nameof(this.Values), "Length of values array does not match the grid points");
} }
} }

27
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.Metadata.Profiles.Icc;
using SixLabors.ImageSharp.Tests.TestDataIcc.Conversion; using SixLabors.ImageSharp.Tests.TestDataIcc.Conversion;
namespace SixLabors.ImageSharp.Tests.Colorspaces.Icc.Calculators namespace SixLabors.ImageSharp.Tests.Colorspaces.Icc.Calculators;
/// <summary>
/// Tests ICC <see cref="CurveCalculator"/>
/// </summary>
[Trait("Color", "Conversion")]
public class CurveCalculatorTests
{ {
/// <summary> [Theory]
/// Tests ICC <see cref="CurveCalculator"/> [MemberData(nameof(IccConversionDataTrc.CurveConversionTestData), MemberType = typeof(IccConversionDataTrc))]
/// </summary> internal void CurveCalculator_WithCurveEntry_ReturnsResult(IccCurveTagDataEntry curve, bool inverted, float input, float expected)
[Trait("Color", "Conversion")]
public class CurveCalculatorTests
{ {
[Theory] CurveCalculator calculator = new(curve, inverted);
[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);
float result = calculator.Calculate(input); float result = calculator.Calculate(input);
Assert.Equal(expected, result, 4); Assert.Equal(expected, result, 4f);
}
} }
} }

2
tests/ImageSharp.Tests/Colorspaces/Icc/Calculators/LutCalculatorTests.cs

@ -20,7 +20,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces.Icc.Calculators
float result = calculator.Calculate(input); float result = calculator.Calculate(input);
Assert.Equal(expected, result, 4); Assert.Equal(expected, result, 4f);
} }
} }
} }

2
tests/ImageSharp.Tests/Colorspaces/Icc/Calculators/ParametricCurveCalculatorTests.cs

@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces.Icc.Calculators
float result = calculator.Calculate(input); float result = calculator.Calculate(input);
Assert.Equal(expected, result, 4); Assert.Equal(expected, result, 4f);
} }
} }
} }

Loading…
Cancel
Save