From a0e6fa45cde4761e75c596d33f1408c061021803 Mon Sep 17 00:00:00 2001 From: Jason Nelson Date: Thu, 6 Dec 2018 08:52:55 -0800 Subject: [PATCH] Use GetHashCode when combining int values --- .../MetaData/Profiles/ICC/Curves/IccParametricCurve.cs | 2 +- src/ImageSharp/MetaData/Profiles/ICC/Curves/IccResponseCurve.cs | 2 +- .../Profiles/ICC/TagDataEntries/IccChromaticityTagDataEntry.cs | 2 +- .../ICC/TagDataEntries/IccViewingConditionsTagDataEntry.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccParametricCurve.cs b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccParametricCurve.cs index f707ee595e..0f50b366c7 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccParametricCurve.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccParametricCurve.cs @@ -156,7 +156,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc { unchecked { - int hashCode = (int)this.Type; + int hashCode = this.Type.GetHashCode(); hashCode = HashHelpers.Combine(hashCode, this.G.GetHashCode()); hashCode = HashHelpers.Combine(hashCode, this.A.GetHashCode()); hashCode = HashHelpers.Combine(hashCode, this.B.GetHashCode()); diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccResponseCurve.cs b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccResponseCurve.cs index 16b0ddbef9..04984a4f24 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccResponseCurve.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccResponseCurve.cs @@ -74,7 +74,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public override int GetHashCode() { return HashHelpers.Combine( - (int)this.CurveType, + this.CurveType.GetHashCode(), this.XyzValues.GetHashCode(), this.ResponseArrays.GetHashCode()); } diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccChromaticityTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccChromaticityTagDataEntry.cs index 0a27ce2d58..0b2aa7afc8 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccChromaticityTagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccChromaticityTagDataEntry.cs @@ -112,7 +112,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc { return HashHelpers.Combine( base.GetHashCode(), - (int)this.ColorantType, + this.ColorantType.GetHashCode(), this.ChannelValues.GetHashCode()); } diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccViewingConditionsTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccViewingConditionsTagDataEntry.cs index df53957b13..5b12c9d7ec 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccViewingConditionsTagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccViewingConditionsTagDataEntry.cs @@ -90,7 +90,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc base.GetHashCode(), this.IlluminantXyz.GetHashCode(), this.SurroundXyz.GetHashCode(), - (int)this.Illuminant); + this.Illuminant.GetHashCode()); } } }