diff --git a/src/ImageSharp/ColorSpaces/CieLab.cs b/src/ImageSharp/ColorSpaces/CieLab.cs index 9d8d662c8..9eb072a53 100644 --- a/src/ImageSharp/ColorSpaces/CieLab.cs +++ b/src/ImageSharp/ColorSpaces/CieLab.cs @@ -165,23 +165,15 @@ namespace SixLabors.ImageSharp.ColorSpaces /// public override int GetHashCode() { - unchecked - { - int hashCode = this.WhitePoint.GetHashCode(); - hashCode = (hashCode * 397) ^ this.backingVector.GetHashCode(); - return hashCode; - } + return HashHelpers.Combine(this.WhitePoint.GetHashCode(), this.backingVector.GetHashCode()); } /// public override string ToString() { - if (this.IsEmpty) - { - return "CieLab [Empty]"; - } - - return $"CieLab [ L={this.L:#0.##}, A={this.A:#0.##}, B={this.B:#0.##}]"; + return this.IsEmpty + ? "CieLab [Empty]" + : $"CieLab [ L={this.L:#0.##}, A={this.A:#0.##}, B={this.B:#0.##}]"; } /// diff --git a/src/ImageSharp/ColorSpaces/CieLch.cs b/src/ImageSharp/ColorSpaces/CieLch.cs index 521e647e4..059e9684f 100644 --- a/src/ImageSharp/ColorSpaces/CieLch.cs +++ b/src/ImageSharp/ColorSpaces/CieLch.cs @@ -167,23 +167,15 @@ namespace SixLabors.ImageSharp.ColorSpaces /// public override int GetHashCode() { - unchecked - { - int hashCode = this.WhitePoint.GetHashCode(); - hashCode = (hashCode * 397) ^ this.backingVector.GetHashCode(); - return hashCode; - } + return HashHelpers.Combine(this.WhitePoint.GetHashCode(), this.backingVector.GetHashCode()); } /// public override string ToString() { - if (this.IsEmpty) - { - return "CieLch [Empty]"; - } - - return $"CieLch [ L={this.L:#0.##}, C={this.C:#0.##}, H={this.H:#0.##}]"; + return this.IsEmpty + ? "CieLch [Empty]" + : $"CieLch [ L={this.L:#0.##}, C={this.C:#0.##}, H={this.H:#0.##}]"; } /// diff --git a/src/ImageSharp/ColorSpaces/CieLchuv.cs b/src/ImageSharp/ColorSpaces/CieLchuv.cs index 682d7f2e4..503ce65aa 100644 --- a/src/ImageSharp/ColorSpaces/CieLchuv.cs +++ b/src/ImageSharp/ColorSpaces/CieLchuv.cs @@ -165,23 +165,15 @@ namespace SixLabors.ImageSharp.ColorSpaces /// public override int GetHashCode() { - unchecked - { - int hashCode = this.WhitePoint.GetHashCode(); - hashCode = (hashCode * 397) ^ this.backingVector.GetHashCode(); - return hashCode; - } + return HashHelpers.Combine(this.WhitePoint.GetHashCode(), this.backingVector.GetHashCode()); } /// public override string ToString() { - if (this.IsEmpty) - { - return "CieLchuv [Empty]"; - } - - return $"CieLchuv [ L={this.L:#0.##}, C={this.C:#0.##}, H={this.H:#0.##}]"; + return this.IsEmpty + ? "CieLchuv [Empty]" + : $"CieLchuv [ L={this.L:#0.##}, C={this.C:#0.##}, H={this.H:#0.##}"; } /// @@ -191,7 +183,6 @@ namespace SixLabors.ImageSharp.ColorSpaces } /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] public bool Equals(CieLchuv other) { return this.backingVector.Equals(other.backingVector) diff --git a/src/ImageSharp/ColorSpaces/CieLuv.cs b/src/ImageSharp/ColorSpaces/CieLuv.cs index 60827e4aa..8b385418c 100644 --- a/src/ImageSharp/ColorSpaces/CieLuv.cs +++ b/src/ImageSharp/ColorSpaces/CieLuv.cs @@ -167,23 +167,15 @@ namespace SixLabors.ImageSharp.ColorSpaces /// public override int GetHashCode() { - unchecked - { - int hashCode = this.WhitePoint.GetHashCode(); - hashCode = (hashCode * 397) ^ this.backingVector.GetHashCode(); - return hashCode; - } + return HashHelpers.Combine(this.WhitePoint.GetHashCode(), this.backingVector.GetHashCode()); } /// public override string ToString() { - if (this.IsEmpty) - { - return "CieLuv [ Empty ]"; - } - - return $"CieLuv [ L={this.L:#0.##}, U={this.U:#0.##}, V={this.V:#0.##} ]"; + return this.IsEmpty + ? "CieLuv [ Empty ]" + : $"CieLuv [ L={this.L:#0.##}, U={this.U:#0.##}, V={this.V:#0.##} ]"; } /// diff --git a/src/ImageSharp/ColorSpaces/HunterLab.cs b/src/ImageSharp/ColorSpaces/HunterLab.cs index 9197be32e..671801949 100644 --- a/src/ImageSharp/ColorSpaces/HunterLab.cs +++ b/src/ImageSharp/ColorSpaces/HunterLab.cs @@ -161,23 +161,15 @@ namespace SixLabors.ImageSharp.ColorSpaces /// public override int GetHashCode() { - unchecked - { - int hashCode = this.WhitePoint.GetHashCode(); - hashCode = (hashCode * 397) ^ this.backingVector.GetHashCode(); - return hashCode; - } + return HashHelpers.Combine(this.WhitePoint.GetHashCode(), this.backingVector.GetHashCode()); } /// public override string ToString() { - if (this.IsEmpty) - { - return "HunterLab [Empty]"; - } - - return $"HunterLab [ L={this.L:#0.##}, A={this.A:#0.##}, B={this.B:#0.##}]"; + return this.IsEmpty + ? "HunterLab [Empty]" + : $"HunterLab [ L={this.L:#0.##}, A={this.A:#0.##}, B={this.B:#0.##}]"; } ///