From 2922b8dc406c4a950f5e7fe778697f3495322e37 Mon Sep 17 00:00:00 2001 From: Jason Nelson Date: Mon, 20 Aug 2018 10:27:18 -0700 Subject: [PATCH 1/3] Optimize Equals & GetHashCode methods within PixelFormats --- src/ImageSharp/PixelFormats/Alpha8.cs | 5 +---- src/ImageSharp/PixelFormats/Argb32.cs | 7 +------ src/ImageSharp/PixelFormats/Bgr565.cs | 5 +---- src/ImageSharp/PixelFormats/Bgra32.cs | 10 ++-------- src/ImageSharp/PixelFormats/Bgra4444.cs | 5 +---- src/ImageSharp/PixelFormats/Bgra5551.cs | 5 +---- src/ImageSharp/PixelFormats/Byte4.cs | 5 +---- src/ImageSharp/PixelFormats/HalfSingle.cs | 5 +---- src/ImageSharp/PixelFormats/HalfVector2.cs | 5 +---- src/ImageSharp/PixelFormats/HalfVector4.cs | 5 +---- src/ImageSharp/PixelFormats/NormalizedByte2.cs | 5 +---- src/ImageSharp/PixelFormats/NormalizedByte4.cs | 5 +---- src/ImageSharp/PixelFormats/Rgba32.cs | 7 +------ src/ImageSharp/PixelFormats/Rgba64.cs | 5 +---- src/ImageSharp/PixelFormats/Short2.cs | 5 +---- src/ImageSharp/PixelFormats/Short4.cs | 5 +---- 16 files changed, 17 insertions(+), 72 deletions(-) diff --git a/src/ImageSharp/PixelFormats/Alpha8.cs b/src/ImageSharp/PixelFormats/Alpha8.cs index 0b16fed0a..a8d97d31a 100644 --- a/src/ImageSharp/PixelFormats/Alpha8.cs +++ b/src/ImageSharp/PixelFormats/Alpha8.cs @@ -208,10 +208,7 @@ namespace SixLabors.ImageSharp.PixelFormats /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public override int GetHashCode() - { - return this.PackedValue.GetHashCode(); - } + public override int GetHashCode() => this.PackedValue.GetHashCode(); /// /// Packs a into a byte. diff --git a/src/ImageSharp/PixelFormats/Argb32.cs b/src/ImageSharp/PixelFormats/Argb32.cs index ccb17a2a5..51d3964ef 100644 --- a/src/ImageSharp/PixelFormats/Argb32.cs +++ b/src/ImageSharp/PixelFormats/Argb32.cs @@ -362,12 +362,7 @@ namespace SixLabors.ImageSharp.PixelFormats /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public override int GetHashCode() - { - int hash = HashHelpers.Combine(this.R.GetHashCode(), this.G.GetHashCode()); - hash = HashHelpers.Combine(hash, this.B.GetHashCode()); - return HashHelpers.Combine(hash, this.A.GetHashCode()); - } + public override int GetHashCode() => this.Argb.GetHashCode(); /// /// Gets the representation without normalizing to [0, 1] diff --git a/src/ImageSharp/PixelFormats/Bgr565.cs b/src/ImageSharp/PixelFormats/Bgr565.cs index f9a0ce9dc..570b975db 100644 --- a/src/ImageSharp/PixelFormats/Bgr565.cs +++ b/src/ImageSharp/PixelFormats/Bgr565.cs @@ -224,10 +224,7 @@ namespace SixLabors.ImageSharp.PixelFormats /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public override int GetHashCode() - { - return this.PackedValue.GetHashCode(); - } + public override int GetHashCode() => this.PackedValue.GetHashCode(); /// /// Packs the components into a . diff --git a/src/ImageSharp/PixelFormats/Bgra32.cs b/src/ImageSharp/PixelFormats/Bgra32.cs index 14b2da07c..233df2f29 100644 --- a/src/ImageSharp/PixelFormats/Bgra32.cs +++ b/src/ImageSharp/PixelFormats/Bgra32.cs @@ -1,7 +1,6 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -using System; using System.Numerics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -105,19 +104,14 @@ namespace SixLabors.ImageSharp.PixelFormats /// public bool Equals(Bgra32 other) { - return this.R == other.R && this.G == other.G && this.B == other.B && this.A == other.A; + return this.Bgra == other.Bgra; } /// public override bool Equals(object obj) => obj is Bgra32 other && this.Equals(other); /// - public override int GetHashCode() - { - int hash = HashHelpers.Combine(this.R.GetHashCode(), this.G.GetHashCode()); - hash = HashHelpers.Combine(hash, this.B.GetHashCode()); - return HashHelpers.Combine(hash, this.A.GetHashCode()); - } + public override int GetHashCode() => this.Bgra.GetHashCode(); /// /// Gets the representation without normalizing to [0, 1] diff --git a/src/ImageSharp/PixelFormats/Bgra4444.cs b/src/ImageSharp/PixelFormats/Bgra4444.cs index b006aa5d2..90f967f89 100644 --- a/src/ImageSharp/PixelFormats/Bgra4444.cs +++ b/src/ImageSharp/PixelFormats/Bgra4444.cs @@ -215,10 +215,7 @@ namespace SixLabors.ImageSharp.PixelFormats /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public override int GetHashCode() - { - return this.PackedValue.GetHashCode(); - } + public override int GetHashCode() => this.PackedValue.GetHashCode(); /// /// Packs the components into a . diff --git a/src/ImageSharp/PixelFormats/Bgra5551.cs b/src/ImageSharp/PixelFormats/Bgra5551.cs index 90a625142..3a18c03e8 100644 --- a/src/ImageSharp/PixelFormats/Bgra5551.cs +++ b/src/ImageSharp/PixelFormats/Bgra5551.cs @@ -221,10 +221,7 @@ namespace SixLabors.ImageSharp.PixelFormats /// /// The hash code for the packed vector. [MethodImpl(MethodImplOptions.AggressiveInlining)] - public override int GetHashCode() - { - return this.PackedValue.GetHashCode(); - } + public override int GetHashCode() => this.PackedValue.GetHashCode(); /// /// Packs the components into a . diff --git a/src/ImageSharp/PixelFormats/Byte4.cs b/src/ImageSharp/PixelFormats/Byte4.cs index 426955727..bb1b350f0 100644 --- a/src/ImageSharp/PixelFormats/Byte4.cs +++ b/src/ImageSharp/PixelFormats/Byte4.cs @@ -210,10 +210,7 @@ namespace SixLabors.ImageSharp.PixelFormats /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public override int GetHashCode() - { - return this.PackedValue.GetHashCode(); - } + public override int GetHashCode() => this.PackedValue.GetHashCode(); /// /// Returns a string representation of the current instance. diff --git a/src/ImageSharp/PixelFormats/HalfSingle.cs b/src/ImageSharp/PixelFormats/HalfSingle.cs index 54c615f9b..09b463649 100644 --- a/src/ImageSharp/PixelFormats/HalfSingle.cs +++ b/src/ImageSharp/PixelFormats/HalfSingle.cs @@ -229,10 +229,7 @@ namespace SixLabors.ImageSharp.PixelFormats /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public override int GetHashCode() - { - return this.PackedValue.GetHashCode(); - } + public override int GetHashCode() => this.PackedValue.GetHashCode(); [MethodImpl(MethodImplOptions.AggressiveInlining)] private Vector4 ToByteScaledVector4() diff --git a/src/ImageSharp/PixelFormats/HalfVector2.cs b/src/ImageSharp/PixelFormats/HalfVector2.cs index 4a135a77c..befa49736 100644 --- a/src/ImageSharp/PixelFormats/HalfVector2.cs +++ b/src/ImageSharp/PixelFormats/HalfVector2.cs @@ -231,10 +231,7 @@ namespace SixLabors.ImageSharp.PixelFormats /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public override int GetHashCode() - { - return this.PackedValue.GetHashCode(); - } + public override int GetHashCode() => this.PackedValue.GetHashCode(); /// public override bool Equals(object obj) diff --git a/src/ImageSharp/PixelFormats/HalfVector4.cs b/src/ImageSharp/PixelFormats/HalfVector4.cs index 62a25bc2b..885e02292 100644 --- a/src/ImageSharp/PixelFormats/HalfVector4.cs +++ b/src/ImageSharp/PixelFormats/HalfVector4.cs @@ -224,10 +224,7 @@ namespace SixLabors.ImageSharp.PixelFormats /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public override int GetHashCode() - { - return this.PackedValue.GetHashCode(); - } + public override int GetHashCode() => this.PackedValue.GetHashCode(); /// public override bool Equals(object obj) diff --git a/src/ImageSharp/PixelFormats/NormalizedByte2.cs b/src/ImageSharp/PixelFormats/NormalizedByte2.cs index 75a907594..dc220aef6 100644 --- a/src/ImageSharp/PixelFormats/NormalizedByte2.cs +++ b/src/ImageSharp/PixelFormats/NormalizedByte2.cs @@ -257,10 +257,7 @@ namespace SixLabors.ImageSharp.PixelFormats /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public override int GetHashCode() - { - return this.PackedValue.GetHashCode(); - } + public override int GetHashCode() => this.PackedValue.GetHashCode();; /// public override string ToString() diff --git a/src/ImageSharp/PixelFormats/NormalizedByte4.cs b/src/ImageSharp/PixelFormats/NormalizedByte4.cs index fc3845eb2..293d536e5 100644 --- a/src/ImageSharp/PixelFormats/NormalizedByte4.cs +++ b/src/ImageSharp/PixelFormats/NormalizedByte4.cs @@ -250,10 +250,7 @@ namespace SixLabors.ImageSharp.PixelFormats /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public override int GetHashCode() - { - return this.PackedValue.GetHashCode(); - } + public override int GetHashCode() => this.PackedValue.GetHashCode(); /// public override string ToString() diff --git a/src/ImageSharp/PixelFormats/Rgba32.cs b/src/ImageSharp/PixelFormats/Rgba32.cs index 79794ee46..066f80ecd 100644 --- a/src/ImageSharp/PixelFormats/Rgba32.cs +++ b/src/ImageSharp/PixelFormats/Rgba32.cs @@ -437,12 +437,7 @@ namespace SixLabors.ImageSharp.PixelFormats /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public override int GetHashCode() - { - int hash = HashHelpers.Combine(this.R.GetHashCode(), this.G.GetHashCode()); - hash = HashHelpers.Combine(hash, this.B.GetHashCode()); - return HashHelpers.Combine(hash, this.A.GetHashCode()); - } + public override int GetHashCode() => Rgba.GetHashCode(); /// /// Gets the representation without normalizing to [0, 1] diff --git a/src/ImageSharp/PixelFormats/Rgba64.cs b/src/ImageSharp/PixelFormats/Rgba64.cs index a66485ba4..8e6be1e8c 100644 --- a/src/ImageSharp/PixelFormats/Rgba64.cs +++ b/src/ImageSharp/PixelFormats/Rgba64.cs @@ -295,9 +295,6 @@ namespace SixLabors.ImageSharp.PixelFormats /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public override int GetHashCode() - { - return this.PackedValue.GetHashCode(); - } + public override int GetHashCode() => this.PackedValue.GetHashCode(); } } \ No newline at end of file diff --git a/src/ImageSharp/PixelFormats/Short2.cs b/src/ImageSharp/PixelFormats/Short2.cs index c298c5a48..9fc7618b9 100644 --- a/src/ImageSharp/PixelFormats/Short2.cs +++ b/src/ImageSharp/PixelFormats/Short2.cs @@ -249,10 +249,7 @@ namespace SixLabors.ImageSharp.PixelFormats /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public override int GetHashCode() - { - return this.PackedValue.GetHashCode(); - } + public override int GetHashCode() => this.PackedValue.GetHashCode(); /// public override string ToString() diff --git a/src/ImageSharp/PixelFormats/Short4.cs b/src/ImageSharp/PixelFormats/Short4.cs index 5683ffcee..641f154f9 100644 --- a/src/ImageSharp/PixelFormats/Short4.cs +++ b/src/ImageSharp/PixelFormats/Short4.cs @@ -247,10 +247,7 @@ namespace SixLabors.ImageSharp.PixelFormats /// /// Hash code for the instance. [MethodImpl(MethodImplOptions.AggressiveInlining)] - public override int GetHashCode() - { - return this.PackedValue.GetHashCode(); - } + public override int GetHashCode() => this.PackedValue.GetHashCode(); /// /// Returns a string representation of the current instance. From 646c6e0ca7ca0cf5a3426ac36aa9e1054a08c397 Mon Sep 17 00:00:00 2001 From: Jason Nelson Date: Mon, 20 Aug 2018 12:05:27 -0700 Subject: [PATCH 2/3] Remove trailing semicolon --- src/ImageSharp/PixelFormats/NormalizedByte2.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ImageSharp/PixelFormats/NormalizedByte2.cs b/src/ImageSharp/PixelFormats/NormalizedByte2.cs index dc220aef6..8592fdd6a 100644 --- a/src/ImageSharp/PixelFormats/NormalizedByte2.cs +++ b/src/ImageSharp/PixelFormats/NormalizedByte2.cs @@ -257,7 +257,7 @@ namespace SixLabors.ImageSharp.PixelFormats /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public override int GetHashCode() => this.PackedValue.GetHashCode();; + public override int GetHashCode() => this.PackedValue.GetHashCode(); /// public override string ToString() From 4c15b006175a6462da9f380e669c0016472843ae Mon Sep 17 00:00:00 2001 From: Jason Nelson Date: Mon, 20 Aug 2018 14:18:10 -0700 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=91=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ImageSharp/PixelFormats/Rgba32.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ImageSharp/PixelFormats/Rgba32.cs b/src/ImageSharp/PixelFormats/Rgba32.cs index 066f80ecd..cf66538c5 100644 --- a/src/ImageSharp/PixelFormats/Rgba32.cs +++ b/src/ImageSharp/PixelFormats/Rgba32.cs @@ -437,7 +437,7 @@ namespace SixLabors.ImageSharp.PixelFormats /// [MethodImpl(MethodImplOptions.AggressiveInlining)] - public override int GetHashCode() => Rgba.GetHashCode(); + public override int GetHashCode() => this.Rgba.GetHashCode(); /// /// Gets the representation without normalizing to [0, 1]