Tidy up ICC code

src/ImageSharp/MetaData/Profiles/ICC/Curves/IccFormulaCurveElement.cs

@@ -90,4 +90,4 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
             return this.Equals((IccCurveSegment)other);
         }
     }
-}
+}

src/ImageSharp/MetaData/Profiles/ICC/Curves/IccOneDimensionalCurve.cs

@@ -7,7 +7,7 @@ using System.Linq;
 namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
 {
     /// <summary>
-    /// A one dimensional curve
+    /// A one dimensional ICC curve.
     /// </summary>
     internal sealed class IccOneDimensionalCurve : IEquatable<IccOneDimensionalCurve>
     {

src/ImageSharp/MetaData/Profiles/ICC/Curves/IccParametricCurve.cs

@@ -125,7 +125,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public bool Equals(IccParametricCurve other)
         {
-            if (ReferenceEquals(null, other))
+            if (other == null)
             {
                 return false;
             }
@@ -148,7 +148,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj == null)
             {
                 return false;
             }

src/ImageSharp/MetaData/Profiles/ICC/Curves/IccResponseCurve.cs

@@ -49,7 +49,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public bool Equals(IccResponseCurve other)
         {
-            if (ReferenceEquals(null, other))
+            if (other == null)
             {
                 return false;
             }
@@ -67,7 +67,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc />
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj == null)
             {
                 return false;
             }

src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Curves.cs

@@ -191,7 +191,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <returns>The curve data</returns>
         private IccTagDataEntry[] ReadCurves(int count)
         {
-            IccTagDataEntry[] tdata = new IccTagDataEntry[count];
+            var tdata = new IccTagDataEntry[count];
             for (int i = 0; i < count; i++)
             {
                 IccTypeSignature type = this.ReadTagDataEntryHeader();

src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Primitives.cs

@@ -67,7 +67,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         }
 
         /// <summary>
-        /// Reads a float
+        /// Reads a float.
         /// </summary>
         /// <returns>the value</returns>
         public unsafe float ReadSingle()
@@ -89,7 +89,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         }
 
         /// <summary>
-        /// Reads an ASCII encoded string
+        /// Reads an ASCII encoded string.
         /// </summary>
         /// <param name="length">number of bytes to read</param>
         /// <returns>The value as a string</returns>
@@ -114,7 +114,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         }
 
         /// <summary>
-        /// Reads an UTF-16 big-endian encoded string
+        /// Reads an UTF-16 big-endian encoded string.
         /// </summary>
         /// <param name="length">number of bytes to read</param>
         /// <returns>The value as a string</returns>
@@ -131,34 +131,25 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         }
 
         /// <summary>
-        /// Reads a signed 32bit number with 1 sign bit, 15 value bits and 16 fractional bits
+        /// Reads a signed 32bit number with 1 sign bit, 15 value bits and 16 fractional bits.
         /// </summary>
         /// <returns>The number as double</returns>
-        public float ReadFix16()
-        {
-            return this.ReadInt32() / 65536f;
-        }
+        public float ReadFix16() => this.ReadInt32() / 65536f;
 
         /// <summary>
-        /// Reads an unsigned 32bit number with 16 value bits and 16 fractional bits
+        /// Reads an unsigned 32bit number with 16 value bits and 16 fractional bits.
         /// </summary>
         /// <returns>The number as double</returns>
-        public float ReadUFix16()
-        {
-            return this.ReadUInt32() / 65536f;
-        }
+        public float ReadUFix16() => this.ReadUInt32() / 65536f;
 
         /// <summary>
-        /// Reads an unsigned 16bit number with 1 value bit and 15 fractional bits
+        /// Reads an unsigned 16bit number with 1 value bit and 15 fractional bits.
         /// </summary>
         /// <returns>The number as double</returns>
-        public float ReadU1Fix15()
-        {
-            return this.ReadUInt16() / 32768f;
-        }
+        public float ReadU1Fix15() => this.ReadUInt16() / 32768f;
 
         /// <summary>
-        /// Reads an unsigned 16bit number with 8 value bits and 8 fractional bits
+        /// Reads an unsigned 16bit number with 8 value bits and 8 fractional bits.
         /// </summary>
         /// <returns>The number as double</returns>
         public float ReadUFix8()
@@ -167,7 +158,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         }
 
         /// <summary>
-        /// Reads a number of bytes and advances the index
+        /// Reads a number of bytes and advances the index.
         /// </summary>
         /// <param name="count">The number of bytes to read</param>
         /// <returns>The read bytes</returns>

src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.TagDataEntry.cs

@@ -183,7 +183,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         public IccColorantTableTagDataEntry ReadColorantTableTagDataEntry()
         {
             uint colorantCount = this.ReadUInt32();
-            IccColorantTableEntry[] cdata = new IccColorantTableEntry[colorantCount];
+            var cdata = new IccColorantTableEntry[colorantCount];
             for (int i = 0; i < colorantCount; i++)
             {
                 cdata[i] = this.ReadColorantTableEntry();
@@ -265,7 +265,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
             ushort outTableCount = this.ReadUInt16();
 
             // Input LUT
-            IccLut[] inValues = new IccLut[inChCount];
+            var inValues = new IccLut[inChCount];
             byte[] gridPointCount = new byte[inChCount];
             for (int i = 0; i < inChCount; i++)
             {
@@ -277,7 +277,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
             IccClut clut = this.ReadClut16(inChCount, outChCount, gridPointCount);
 
             // Output LUT
-            IccLut[] outValues = new IccLut[outChCount];
+            var outValues = new IccLut[outChCount];
             for (int i = 0; i < outChCount; i++)
             {
                 outValues[i] = this.ReadLut16(outTableCount);
@@ -300,7 +300,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
             float[,] matrix = this.ReadMatrix(3, 3, false);
 
             // Input LUT
-            IccLut[] inValues = new IccLut[inChCount];
+            var inValues = new IccLut[inChCount];
             byte[] gridPointCount = new byte[inChCount];
             for (int i = 0; i < inChCount; i++)
             {
@@ -312,7 +312,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
             IccClut clut = this.ReadClut8(inChCount, outChCount, gridPointCount);
 
             // Output LUT
-            IccLut[] outValues = new IccLut[outChCount];
+            var outValues = new IccLut[outChCount];
             for (int i = 0; i < outChCount; i++)
             {
                 outValues[i] = this.ReadLut8();
@@ -463,9 +463,9 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
             uint recordCount = this.ReadUInt32();
 
             this.ReadUInt32();  // Record size (always 12)
-            IccLocalizedString[] text = new IccLocalizedString[recordCount];
+            var text = new IccLocalizedString[recordCount];
 
-            CultureInfo[] culture = new CultureInfo[recordCount];
+            var culture = new CultureInfo[recordCount];
             uint[] length = new uint[recordCount];
             uint[] offset = new uint[recordCount];
 
@@ -531,13 +531,13 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
             ushort outChannelCount = this.ReadUInt16();
             uint elementCount = this.ReadUInt32();
 
-            IccPositionNumber[] positionTable = new IccPositionNumber[elementCount];
+            var positionTable = new IccPositionNumber[elementCount];
             for (int i = 0; i < elementCount; i++)
             {
                 positionTable[i] = this.ReadPositionNumber();
             }
 
-            IccMultiProcessElement[] elements = new IccMultiProcessElement[elementCount];
+            var elements = new IccMultiProcessElement[elementCount];
             for (int i = 0; i < elementCount; i++)
             {
                 this.currentIndex = (int)positionTable[i].Offset + start;
@@ -559,7 +559,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
             string prefix = this.ReadAsciiString(32);
             string suffix = this.ReadAsciiString(32);
 
-            IccNamedColor[] colors = new IccNamedColor[colorCount];
+            var colors = new IccNamedColor[colorCount];
             for (int i = 0; i < colorCount; i++)
             {
                 colors[i] = this.ReadNamedColor(coordCount);
@@ -584,7 +584,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         public IccProfileSequenceDescTagDataEntry ReadProfileSequenceDescTagDataEntry()
         {
             uint count = this.ReadUInt32();
-            IccProfileDescription[] description = new IccProfileDescription[count];
+            var description = new IccProfileDescription[count];
             for (int i = 0; i < count; i++)
             {
                 description[i] = this.ReadProfileDescription();
@@ -601,13 +601,13 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         {
             int start = this.currentIndex - 8; // 8 is the tag header size
             uint count = this.ReadUInt32();
-            IccPositionNumber[] table = new IccPositionNumber[count];
+            var table = new IccPositionNumber[count];
             for (int i = 0; i < count; i++)
             {
                 table[i] = this.ReadPositionNumber();
             }
 
-            IccProfileSequenceIdentifier[] entries = new IccProfileSequenceIdentifier[count];
+            var entries = new IccProfileSequenceIdentifier[count];
             for (int i = 0; i < count; i++)
             {
                 this.currentIndex = (int)(start + table[i].Offset);
@@ -636,7 +636,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
                 offset[i] = this.ReadUInt32();
             }
 
-            IccResponseCurve[] curves = new IccResponseCurve[measurmentCount];
+            var curves = new IccResponseCurve[measurmentCount];
             for (int i = 0; i < measurmentCount; i++)
             {
                 this.currentIndex = (int)(start + offset[i]);
@@ -783,7 +783,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         public IccXyzTagDataEntry ReadXyzTagDataEntry(uint size)
         {
             uint count = (size - 8) / 12;
-            Vector3[] arrayData = new Vector3[count];
+            var arrayData = new Vector3[count];
             for (int i = 0; i < count; i++)
             {
                 arrayData[i] = this.ReadXyzNumber();
@@ -864,7 +864,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         {
             var flags = (IccScreeningFlag)this.ReadInt32();
             uint channelCount = this.ReadUInt32();
-            IccScreeningChannel[] channels = new IccScreeningChannel[channelCount];
+            var channels = new IccScreeningChannel[channelCount];
             for (int i = 0; i < channels.Length; i++)
             {
                 channels[i] = this.ReadScreeningChannel();
@@ -902,4 +902,4 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
             return new IccUcrBgTagDataEntry(ucrCurve, bgCurve, description);
         }
     }
-}
+}

src/ImageSharp/MetaData/Profiles/ICC/Exceptions/InvalidIccProfileException.cs

@@ -10,13 +10,6 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
     /// </summary>
     public class InvalidIccProfileException : Exception
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InvalidIccProfileException"/> class.
-        /// </summary>
-        public InvalidIccProfileException()
-        {
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="InvalidIccProfileException"/> class.
         /// </summary>
@@ -37,4 +30,4 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         {
         }
     }
-}
+}

src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccCurveSetProcessElement.cs

@@ -44,4 +44,4 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
             return this.Equals((IccMultiProcessElement)other);
         }
     }
-}
+}

src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccMultiProcessElement.cs

@@ -27,7 +27,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         }
 
         /// <summary>
-        /// Gets the signature of this element
+        /// Gets the signature of this element,
         /// </summary>
         public IccMultiProcessElementSignature Signature { get; }
 
@@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         public int InputChannelCount { get; }
 
         /// <summary>
-        /// Gets the number of output channels
+        /// Gets the number of output channels.
         /// </summary>
         public int OutputChannelCount { get; }
 

src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccChromaticityTagDataEntry.cs

@@ -105,7 +105,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj == null)
             {
                 return false;
             }

src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccColorantOrderTagDataEntry.cs

@@ -43,14 +43,13 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public override bool Equals(IccTagDataEntry other)
         {
-            var entry = other as IccColorantOrderTagDataEntry;
-            return entry != null && this.Equals(entry);
+            return other is IccColorantOrderTagDataEntry entry && this.Equals(entry);
         }
 
         /// <inheritdoc/>
         public bool Equals(IccColorantOrderTagDataEntry other)
         {
-            if (ReferenceEquals(null, other))
+            if (other == null)
             {
                 return false;
             }
@@ -66,7 +65,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj == null)
             {
                 return false;
             }

src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccColorantTableTagDataEntry.cs

@@ -44,14 +44,13 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public override bool Equals(IccTagDataEntry other)
         {
-            var entry = other as IccColorantTableTagDataEntry;
-            return entry != null && this.Equals(entry);
+            return other is IccColorantTableTagDataEntry entry && this.Equals(entry);
         }
 
         /// <inheritdoc/>
         public bool Equals(IccColorantTableTagDataEntry other)
         {
-            if (ReferenceEquals(null, other))
+            if (other == null)
             {
                 return false;
             }
@@ -67,7 +66,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj == null)
             {
                 return false;
             }

src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccCrdInfoTagDataEntry.cs

@@ -116,7 +116,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj == null)
             {
                 return false;
             }

src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccCurveTagDataEntry.cs

@@ -91,14 +91,13 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public override bool Equals(IccTagDataEntry other)
         {
-            var entry = other as IccCurveTagDataEntry;
-            return entry != null && this.Equals(entry);
+            return other is IccCurveTagDataEntry entry && this.Equals(entry);
         }
 
         /// <inheritdoc/>
         public bool Equals(IccCurveTagDataEntry other)
         {
-            if (ReferenceEquals(null, other))
+            if (other == null)
             {
                 return false;
             }
@@ -114,7 +113,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj == null)
             {
                 return false;
             }

src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccDataTagDataEntry.cs

@@ -74,7 +74,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public bool Equals(IccDataTagDataEntry other)
         {
-            if (ReferenceEquals(null, other))
+            if (other == null)
             {
                 return false;
             }

src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccDateTimeTagDataEntry.cs

@@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public bool Equals(IccDateTimeTagDataEntry other)
         {
-            if (ReferenceEquals(null, other))
+            if (other == null)
             {
                 return false;
             }
@@ -61,7 +61,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj == null)
             {
                 return false;
             }

src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccLutAToBTagDataEntry.cs

@@ -178,7 +178,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj == null)
             {
                 return false;
             }

src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccMultiLocalizedUnicodeTagDataEntry.cs

@@ -64,7 +64,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj == null)
             {
                 return false;
             }

src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt32ArrayTagDataEntry.cs

@@ -63,7 +63,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj == null)
             {
                 return false;
             }

src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt64ArrayTagDataEntry.cs

@@ -63,7 +63,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj == null)
             {
                 return false;
             }

src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt8ArrayTagDataEntry.cs

@@ -33,7 +33,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         }
 
         /// <summary>
-        /// Gets the array data
+        /// Gets the array data.
         /// </summary>
         public byte[] Data { get; }
 
@@ -63,7 +63,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj == null)
             {
                 return false;
             }

src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccViewingConditionsTagDataEntry.cs

@@ -38,7 +38,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         }
 
         /// <summary>
-        /// Gets the XYZ values of Illuminant
+        /// Gets the XYZ values of illuminant.
         /// </summary>
         public Vector3 IlluminantXyz { get; }
 
@@ -47,8 +47,8 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// </summary>
         public Vector3 SurroundXyz { get; }
 
-        /// <summary>
-        /// Gets the illuminant
+        /// <summary>.
+        /// Gets the illuminant.
         /// </summary>
         public IccStandardIlluminant Illuminant { get; }
 
@@ -81,7 +81,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj == null)
             {
                 return false;
             }

src/ImageSharp/MetaData/Profiles/ICC/Various/IccClut.cs

@@ -136,7 +136,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj == null)
             {
                 return false;
             }
@@ -146,7 +146,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
                 return true;
             }
 
-            return obj is IccClut && this.Equals((IccClut)obj);
+            return obj is IccClut other && this.Equals(other);
         }
 
         /// <inheritdoc/>

src/ImageSharp/MetaData/Profiles/ICC/Various/IccColorantTableEntry.cs

@@ -87,9 +87,9 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         }
 
         /// <inheritdoc/>
-        public override bool Equals(object other)
+        public override bool Equals(object obj)
         {
-            return (other is IccColorantTableEntry) && this.Equals((IccColorantTableEntry)other);
+            return obj is IccColorantTableEntry other && this.Equals(other);
         }
 
         /// <inheritdoc/>

src/ImageSharp/MetaData/Profiles/ICC/Various/IccNamedColor.cs

@@ -74,18 +74,16 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         }
 
         /// <inheritdoc/>
-        public override bool Equals(object other)
+        public override bool Equals(object obj)
         {
-            return (other is IccNamedColor) && this.Equals((IccNamedColor)other);
+            return obj is IccNamedColor other && this.Equals(other);
         }
 
         /// <inheritdoc/>
-        public bool Equals(IccNamedColor other)
-        {
-            return this.Name == other.Name
-                && this.PcsCoordinates.SequenceEqual(other.PcsCoordinates)
-                && this.DeviceCoordinates.SequenceEqual(other.DeviceCoordinates);
-        }
+        public bool Equals(IccNamedColor other) =>
+            this.Name == other.Name &&
+            this.PcsCoordinates.SequenceEqual(other.PcsCoordinates) &&
+            this.DeviceCoordinates.SequenceEqual(other.DeviceCoordinates);
 
         /// <inheritdoc/>
         public override int GetHashCode()

src/ImageSharp/MetaData/Profiles/ICC/Various/IccPositionNumber.cs

@@ -62,17 +62,15 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         }
 
         /// <inheritdoc/>
-        public override bool Equals(object other)
+        public override bool Equals(object obj)
         {
-            return (other is IccPositionNumber) && this.Equals((IccPositionNumber)other);
+            return obj is IccPositionNumber other && this.Equals(other);
         }
 
         /// <inheritdoc/>
-        public bool Equals(IccPositionNumber other)
-        {
-            return this.Offset == other.Offset
-                && this.Size == other.Size;
-        }
+        public bool Equals(IccPositionNumber other) =>
+            this.Offset == other.Offset &&
+            this.Size == other.Size;
 
         /// <inheritdoc/>
         public override int GetHashCode()

src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileDescription.cs

@@ -93,7 +93,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc />
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj == null)
             {
                 return false;
             }
@@ -103,7 +103,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
                 return true;
             }
 
-            return obj is IccProfileDescription && this.Equals((IccProfileDescription)obj);
+            return obj is IccProfileDescription other && this.Equals(other);
         }
 
         /// <inheritdoc />

src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileId.cs

@@ -95,19 +95,17 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         }
 
         /// <inheritdoc/>
-        public override bool Equals(object other)
+        public override bool Equals(object obj)
         {
-            return (other is IccProfileId) && this.Equals((IccProfileId)other);
+            return obj is IccProfileId other && this.Equals(other);
         }
 
         /// <inheritdoc/>
-        public bool Equals(IccProfileId other)
-        {
-            return this.Part1 == other.Part1
-                && this.Part2 == other.Part2
-                && this.Part3 == other.Part3
-                && this.Part4 == other.Part4;
-        }
+        public bool Equals(IccProfileId other) =>
+            this.Part1 == other.Part1 &&
+            this.Part2 == other.Part2 &&
+            this.Part3 == other.Part3 &&
+            this.Part4 == other.Part4;
 
         /// <inheritdoc/>
         public override int GetHashCode()

src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileSequenceIdentifier.cs

@@ -53,7 +53,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <inheritdoc />
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj == null)
             {
                 return false;
             }
@@ -63,7 +63,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
                 return true;
             }
 
-            return obj is IccProfileSequenceIdentifier && this.Equals((IccProfileSequenceIdentifier)obj);
+            return obj is IccProfileSequenceIdentifier other && this.Equals(other);
         }
 
         /// <inheritdoc />

src/ImageSharp/MetaData/Profiles/ICC/Various/IccResponseNumber.cs

@@ -62,17 +62,15 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         }
 
         /// <inheritdoc/>
-        public override bool Equals(object other)
+        public override bool Equals(object obj)
         {
-            return (other is IccResponseNumber) && this.Equals((IccResponseNumber)other);
+            return obj is IccResponseNumber other && this.Equals(other);
         }
 
         /// <inheritdoc/>
-        public bool Equals(IccResponseNumber other)
-        {
-            return this.DeviceCode == other.DeviceCode
-                && this.MeasurementValue == other.MeasurementValue;
-        }
+        public bool Equals(IccResponseNumber other) =>
+            this.DeviceCode == other.DeviceCode &&
+            this.MeasurementValue == other.MeasurementValue;
 
         /// <inheritdoc/>
         public override int GetHashCode()

src/ImageSharp/MetaData/Profiles/ICC/Various/IccScreeningChannel.cs

@@ -69,12 +69,10 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         }
 
         /// <inheritdoc />
-        public bool Equals(IccScreeningChannel other)
-        {
-            return this.Frequency.Equals(other.Frequency)
-                && this.Angle.Equals(other.Angle)
-                && this.SpotShape == other.SpotShape;
-        }
+        public bool Equals(IccScreeningChannel other) =>
+            this.Frequency == other.Frequency &&
+            this.Angle == other.Angle &&
+            this.SpotShape == other.SpotShape;
 
         /// <inheritdoc/>
         public override bool Equals(object obj)

src/ImageSharp/MetaData/Profiles/ICC/Various/IccTagTableEntry.cs

@@ -69,18 +69,16 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         }
 
         /// <inheritdoc/>
-        public override bool Equals(object other)
+        public override bool Equals(object obj)
         {
-            return (other is IccTagTableEntry) && this.Equals((IccTagTableEntry)other);
+            return obj is IccTagTableEntry other && this.Equals(other);
         }
 
         /// <inheritdoc/>
-        public bool Equals(IccTagTableEntry other)
-        {
-            return this.Signature == other.Signature
-                && this.Offset == other.Offset
-                && this.DataSize == other.DataSize;
-        }
+        public bool Equals(IccTagTableEntry other) =>
+            this.Signature == other.Signature &&
+            this.Offset == other.Offset &&
+            this.DataSize == other.DataSize;
 
         /// <inheritdoc/>
         public override int GetHashCode()