Browse Source

Rename ColorConverter

af/merge-core
James Jackson-South 9 years ago
parent
commit
12f0786785
  1. 4
      src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.Adapt.cs
  2. 4
      src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.CieLab.cs
  3. 4
      src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.CieXyz.cs
  4. 4
      src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.Lms.cs
  5. 8
      src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.cs
  6. 4
      tests/ImageSharp.Tests/Colors/Colorspaces/CieXyzAndCieLabConversionTest.cs
  7. 4
      tests/ImageSharp.Tests/Colors/Colorspaces/CieXyzAndLmsConversionTest.cs
  8. 2
      tests/ImageSharp.Tests/Colors/Colorspaces/ColorConverterAdaptTest.cs

4
src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.Adapt.cs → src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.Adapt.cs

@ -1,4 +1,4 @@
// <copyright file="ColorConverter.cs" company="James Jackson-South">
// <copyright file="ColorSpaceConverter.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
@ -11,7 +11,7 @@ namespace ImageSharp.Colors.Conversion
/// <summary>
/// Converts between color spaces ensuring that the color is adapted using chromatic adaptation.
/// </summary>
public partial class ColorConverter
public partial class ColorSpaceConverter
{
/// <summary>
/// Performs chromatic adaptation of given XYZ color.

4
src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.CieLab.cs → src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.CieLab.cs

@ -1,4 +1,4 @@
// <copyright file="ColorConverter.cs" company="James Jackson-South">
// <copyright file="ColorSpaceConverter.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
@ -11,7 +11,7 @@ namespace ImageSharp.Colors.Conversion
/// <summary>
/// Converts between color spaces ensuring that the color is adapted using chromatic adaptation.
/// </summary>
public partial class ColorConverter
public partial class ColorSpaceConverter
{
/// <summary>
/// Converts a <see cref="CieXyz"/> into a <see cref="CieLab"/>

4
src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.CieXyz.cs → src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.CieXyz.cs

@ -1,4 +1,4 @@
// <copyright file="ColorConverter.cs" company="James Jackson-South">
// <copyright file="ColorSpaceConverter.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
@ -11,7 +11,7 @@ namespace ImageSharp.Colors.Conversion
/// <summary>
/// Converts between color spaces ensuring that the color is adapted using chromatic adaptation.
/// </summary>
public partial class ColorConverter
public partial class ColorSpaceConverter
{
private static readonly CieLabToCieXyzConverter CieLabToCieXyzConverter = new CieLabToCieXyzConverter();

4
src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.Lms.cs → src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.Lms.cs

@ -1,4 +1,4 @@
// <copyright file="ColorConverter.cs" company="James Jackson-South">
// <copyright file="ColorSpaceConverter.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
@ -11,7 +11,7 @@ namespace ImageSharp.Colors.Conversion
/// <summary>
/// Converts between color spaces ensuring that the color is adapted using chromatic adaptation.
/// </summary>
public partial class ColorConverter
public partial class ColorSpaceConverter
{
/// <summary>
/// Converts a <see cref="CieXyz"/> into a <see cref="Lms"/>

8
src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.cs → src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.cs

@ -1,4 +1,4 @@
// <copyright file="ColorConverter.cs" company="James Jackson-South">
// <copyright file="ColorSpaceConverter.cs" company="James Jackson-South">
// Copyright (c) James Jackson-South and contributors.
// Licensed under the Apache License, Version 2.0.
// </copyright>
@ -12,7 +12,7 @@ namespace ImageSharp.Colors.Conversion
/// <summary>
/// Converts between color spaces ensuring that the color is adapted using chromatic adaptation.
/// </summary>
public partial class ColorConverter
public partial class ColorSpaceConverter
{
/// <summary>
/// The default whitepoint used for converting to CieLab
@ -23,9 +23,9 @@ namespace ImageSharp.Colors.Conversion
private CieXyzAndLmsConverter cachedCieXyzAndLmsConverter;
/// <summary>
/// Initializes a new instance of the <see cref="ColorConverter"/> class.
/// Initializes a new instance of the <see cref="ColorSpaceConverter"/> class.
/// </summary>
public ColorConverter()
public ColorSpaceConverter()
{
// Note the order here this is important.
this.WhitePoint = DefaultWhitePoint;

4
tests/ImageSharp.Tests/Colors/Colorspaces/CieXyzAndCieLabConversionTest.cs

@ -33,7 +33,7 @@
{
// Arrange
CieLab input = new CieLab(l, a, b, Illuminants.D65);
ColorConverter converter = new ColorConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 };
ColorSpaceConverter converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 };
// Act
CieXyz output = converter.ToCieXyz(input);
@ -58,7 +58,7 @@
{
// Arrange
CieXyz input = new CieXyz(x, y, z);
ColorConverter converter = new ColorConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 };
ColorSpaceConverter converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 };
// Act
CieLab output = converter.ToCieLab(input);

4
tests/ImageSharp.Tests/Colors/Colorspaces/CieXyzAndLmsConversionTest.cs

@ -29,7 +29,7 @@
{
// Arrange
Lms input = new Lms(x, y, z);
ColorConverter converter = new ColorConverter();
ColorSpaceConverter converter = new ColorSpaceConverter();
// Act
CieXyz output = converter.ToCieXyz(input);
@ -54,7 +54,7 @@
{
// Arrange
CieXyz input = new CieXyz(x, y, z);
ColorConverter converter = new ColorConverter();
ColorSpaceConverter converter = new ColorSpaceConverter();
// Act
Lms output = converter.ToLms(input);

2
tests/ImageSharp.Tests/Colors/Colorspaces/ColorConverterAdaptTest.cs

@ -19,7 +19,7 @@ namespace ImageSharp.Tests
// Arrange
CieXyz input = new CieXyz(x1, y1, z1);
CieXyz expectedOutput = new CieXyz(x2, y2, z2);
ColorConverter converter = new ColorConverter
ColorSpaceConverter converter = new ColorSpaceConverter
{
ChromaticAdaptation = new VonKriesChromaticAdaptation(LmsAdaptationMatrix.XYZScaling),
WhitePoint = Illuminants.D50

Loading…
Cancel
Save