Browse Source

Calculate bool once in constructor.

af/merge-core
James Jackson-South 8 years ago
parent
commit
0427d8c92d
  1. 2
      src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLab.cs
  2. 2
      src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.cs

2
src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLab.cs

@ -165,7 +165,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
public CieLab ToCieLab(in CieXyz color)
{
// Adaptation
CieXyz adapted = !this.whitePoint.Equals(this.targetLabWhitePoint) && this.performChromaticAdaptation
CieXyz adapted = this.performLabChromaticAdaptation
? this.chromaticAdaptation.Transform(color, this.whitePoint, this.targetLabWhitePoint)
: color;

2
src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.cs

@ -19,6 +19,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
private RgbWorkingSpace targetRgbWorkingSpace;
private IChromaticAdaptation chromaticAdaptation;
private bool performChromaticAdaptation;
private bool performLabChromaticAdaptation;
private Matrix4x4 lmsAdaptationMatrix;
private CieXyzAndLmsConverter cieXyzAndLmsConverter;
@ -46,6 +47,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
this.targetRgbWorkingSpace = options.TargetRgbWorkingSpace;
this.chromaticAdaptation = options.ChromaticAdaptation;
this.performChromaticAdaptation = this.chromaticAdaptation != null;
this.performLabChromaticAdaptation = !this.whitePoint.Equals(this.targetLabWhitePoint) && this.performChromaticAdaptation;
this.lmsAdaptationMatrix = options.LmsAdaptationMatrix;
this.cieXyzAndLmsConverter = new CieXyzAndLmsConverter(this.lmsAdaptationMatrix);

Loading…
Cancel
Save