Browse Source

Fix equality operators

pull/457/head
James Jackson-South 8 years ago
parent
commit
f657f41cea
  1. 4
      src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RgbWorkingSpace.cs
  2. 9
      src/ImageSharp/MetaData/ImageProperty.cs
  3. 9
      src/ImageSharp/MetaData/Profiles/Exif/ExifValue.cs
  4. 4
      src/ImageSharp/MetaData/Profiles/Exif/Rational.cs
  5. 4
      src/ImageSharp/MetaData/Profiles/Exif/SignedRational.cs
  6. 11
      tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.SpectralData.cs

4
src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RgbWorkingSpace.cs

@ -50,7 +50,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
/// </returns> /// </returns>
public static bool operator ==(RgbWorkingSpace left, RgbWorkingSpace right) public static bool operator ==(RgbWorkingSpace left, RgbWorkingSpace right)
{ {
return Equals(left, right); return left.Equals(right);
} }
/// <summary> /// <summary>
@ -67,7 +67,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
/// </returns> /// </returns>
public static bool operator !=(RgbWorkingSpace left, RgbWorkingSpace right) public static bool operator !=(RgbWorkingSpace left, RgbWorkingSpace right)
{ {
return !Equals(left, right); return !left.Equals(right);
} }
/// <inheritdoc/> /// <inheritdoc/>

9
src/ImageSharp/MetaData/ImageProperty.cs

@ -71,7 +71,12 @@ namespace SixLabors.ImageSharp.MetaData
/// </returns> /// </returns>
public static bool operator ==(ImageProperty left, ImageProperty right) public static bool operator ==(ImageProperty left, ImageProperty right)
{ {
return Equals(left, right); if (ReferenceEquals(left, right))
{
return true;
}
return left.Equals(right);
} }
/// <summary> /// <summary>
@ -90,7 +95,7 @@ namespace SixLabors.ImageSharp.MetaData
/// </returns> /// </returns>
public static bool operator !=(ImageProperty left, ImageProperty right) public static bool operator !=(ImageProperty left, ImageProperty right)
{ {
return !Equals(left, right); return !(left == right);
} }
/// <summary> /// <summary>

9
src/ImageSharp/MetaData/Profiles/Exif/ExifValue.cs

@ -188,7 +188,12 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
/// </returns> /// </returns>
public static bool operator ==(ExifValue left, ExifValue right) public static bool operator ==(ExifValue left, ExifValue right)
{ {
return ExifValue.Equals(left, right); if (ReferenceEquals(left, right))
{
return true;
}
return left.Equals(right);
} }
/// <summary> /// <summary>
@ -205,7 +210,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
/// </returns> /// </returns>
public static bool operator !=(ExifValue left, ExifValue right) public static bool operator !=(ExifValue left, ExifValue right)
{ {
return !ExifValue.Equals(left, right); return !(left == right);
} }
/// <inheritdoc /> /// <inheritdoc />

4
src/ImageSharp/MetaData/Profiles/Exif/Rational.cs

@ -87,7 +87,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
/// <returns>The <see cref="bool"/></returns> /// <returns>The <see cref="bool"/></returns>
public static bool operator ==(Rational left, Rational right) public static bool operator ==(Rational left, Rational right)
{ {
return Rational.Equals(left, right); return left.Equals(right);
} }
/// <summary> /// <summary>
@ -98,7 +98,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
/// <returns>The <see cref="bool"/></returns> /// <returns>The <see cref="bool"/></returns>
public static bool operator !=(Rational left, Rational right) public static bool operator !=(Rational left, Rational right)
{ {
return !Rational.Equals(left, right); return !left.Equals(right);
} }
/// <summary> /// <summary>

4
src/ImageSharp/MetaData/Profiles/Exif/SignedRational.cs

@ -87,7 +87,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
/// <returns>The <see cref="bool"/></returns> /// <returns>The <see cref="bool"/></returns>
public static bool operator ==(SignedRational left, SignedRational right) public static bool operator ==(SignedRational left, SignedRational right)
{ {
return SignedRational.Equals(left, right); return left.Equals(right);
} }
/// <summary> /// <summary>
@ -98,7 +98,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
/// <returns>The <see cref="bool"/></returns> /// <returns>The <see cref="bool"/></returns>
public static bool operator !=(SignedRational left, SignedRational right) public static bool operator !=(SignedRational left, SignedRational right)
{ {
return !SignedRational.Equals(left, right); return !left.Equals(right);
} }
/// <summary> /// <summary>

11
tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.SpectralData.cs

@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
this.ComponentCount = components.Length; this.ComponentCount = components.Length;
this.Components = components; this.Components = components;
} }
public static SpectralData LoadFromImageSharpDecoder(PdfJsJpegDecoderCore decoder) public static SpectralData LoadFromImageSharpDecoder(PdfJsJpegDecoderCore decoder)
{ {
PdfJsFrameComponent[] srcComponents = decoder.Frame.Components; PdfJsFrameComponent[] srcComponents = decoder.Frame.Components;
@ -137,12 +137,17 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
public static bool operator ==(SpectralData left, SpectralData right) public static bool operator ==(SpectralData left, SpectralData right)
{ {
return Object.Equals(left, right); if (ReferenceEquals(left, right))
{
return true;
}
return left.Equals(right);
} }
public static bool operator !=(SpectralData left, SpectralData right) public static bool operator !=(SpectralData left, SpectralData right)
{ {
return !Object.Equals(left, right); return !(left == right);
} }
} }
} }

Loading…
Cancel
Save