From 5959bfbf3e04da954186fa9f7ceca837a616b41b Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Tue, 6 Feb 2018 22:06:33 +1100 Subject: [PATCH] Update ToString so we can see full output. --- .../ColorSpaces/CieXyChromaticityCoordinates.cs | 9 ++------- .../Rgb/RGBPrimariesChromaticityCoordinates.cs | 13 +++++++------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs b/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs index d9767d45e..94ba6de78 100644 --- a/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs +++ b/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs @@ -124,19 +124,14 @@ namespace SixLabors.ImageSharp.ColorSpaces return "CieXyChromaticityCoordinates [Empty]"; } - return $"CieXyChromaticityCoordinates [ X={this.X:#0.##}, Y={this.Y:#0.##}]"; + return $"CieXyChromaticityCoordinates [ X={this.X}, Y={this.Y}]"; } /// [MethodImpl(MethodImplOptions.AggressiveInlining)] public override bool Equals(object obj) { - if (obj is CieXyChromaticityCoordinates) - { - return this.Equals((CieXyChromaticityCoordinates)obj); - } - - return false; + return obj is CieXyChromaticityCoordinates coordinates && this.Equals(coordinates); } /// diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RGBPrimariesChromaticityCoordinates.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RGBPrimariesChromaticityCoordinates.cs index d5b9b3cbe..062398f94 100644 --- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RGBPrimariesChromaticityCoordinates.cs +++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RGBPrimariesChromaticityCoordinates.cs @@ -76,12 +76,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap /// public override bool Equals(object obj) { - if (obj is RgbPrimariesChromaticityCoordinates) - { - return this.Equals((RgbPrimariesChromaticityCoordinates)obj); - } - - return false; + return obj is RgbPrimariesChromaticityCoordinates coordinates && this.Equals(coordinates); } /// @@ -90,6 +85,12 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap return this.R.Equals(other.R) && this.G.Equals(other.G) && this.B.Equals(other.B); } + /// + public override string ToString() + { + return $"RgbPrimariesChromaticityCoordinates [ R={this.R}, G={this.G}, B={this.B}]"; + } + /// public override int GetHashCode() {