diff --git a/src/ImageSharp/ColorSpaces/CieLab.cs b/src/ImageSharp/ColorSpaces/CieLab.cs
index 5ab133cf9..844387b3e 100644
--- a/src/ImageSharp/ColorSpaces/CieLab.cs
+++ b/src/ImageSharp/ColorSpaces/CieLab.cs
@@ -129,10 +129,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
}
///
- public override string ToString()
- {
- return $"CieLab [ L={this.L:#0.##}, A={this.A:#0.##}, B={this.B:#0.##}]";
- }
+ public override string ToString() => $"CieLab({this.L:#0.##}, {this.A:#0.##}, {this.B:#0.##})";
///
public override bool Equals(object obj) => obj is CieLab other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/CieLch.cs b/src/ImageSharp/ColorSpaces/CieLch.cs
index d2b3d378d..68fe124a6 100644
--- a/src/ImageSharp/ColorSpaces/CieLch.cs
+++ b/src/ImageSharp/ColorSpaces/CieLch.cs
@@ -105,10 +105,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
/// True if the current left is equal to the parameter; otherwise, false.
///
[MethodImpl(InliningOptions.ShortMethod)]
- public static bool operator ==(CieLch left, CieLch right)
- {
- return left.Equals(right);
- }
+ public static bool operator ==(CieLch left, CieLch right) => left.Equals(right);
///
/// Compares two objects for inequality
@@ -131,10 +128,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
}
///
- public override string ToString()
- {
- return $"CieLch [ L={this.L:#0.##}, C={this.C:#0.##}, H={this.H:#0.##}]";
- }
+ public override string ToString() => $"CieLch [ L={this.L:#0.##}, C={this.C:#0.##}, H={this.H:#0.##}]";
///
[MethodImpl(InliningOptions.ShortMethod)]
diff --git a/src/ImageSharp/ColorSpaces/CieLchuv.cs b/src/ImageSharp/ColorSpaces/CieLchuv.cs
index d46c93c75..e37f7fa20 100644
--- a/src/ImageSharp/ColorSpaces/CieLchuv.cs
+++ b/src/ImageSharp/ColorSpaces/CieLchuv.cs
@@ -127,10 +127,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
}
///
- public override string ToString()
- {
- return $"CieLchuv [ L={this.L:#0.##}, C={this.C:#0.##}, H={this.H:#0.##}";
- }
+ public override string ToString() => $"CieLchuv [ L={this.L:#0.##}, C={this.C:#0.##}, H={this.H:#0.##}";
///
public override bool Equals(object obj) => obj is CieLchuv other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/CieLuv.cs b/src/ImageSharp/ColorSpaces/CieLuv.cs
index edf865d3c..10ff7287e 100644
--- a/src/ImageSharp/ColorSpaces/CieLuv.cs
+++ b/src/ImageSharp/ColorSpaces/CieLuv.cs
@@ -130,10 +130,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
}
///
- public override string ToString()
- {
- return $"CieLuv [ L={this.L:#0.##}, U={this.U:#0.##}, V={this.V:#0.##} ]";
- }
+ public override string ToString() => $"CieLuv [ L={this.L:#0.##}, U={this.U:#0.##}, V={this.V:#0.##} ]";
///
public override bool Equals(object obj) => obj is CieLuv other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs b/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs
index 9b258eda7..64ba44878 100644
--- a/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs
+++ b/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs
@@ -49,10 +49,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
/// True if the current left is equal to the parameter; otherwise, false.
///
[MethodImpl(InliningOptions.ShortMethod)]
- public static bool operator ==(CieXyChromaticityCoordinates left, CieXyChromaticityCoordinates right)
- {
- return left.Equals(right);
- }
+ public static bool operator ==(CieXyChromaticityCoordinates left, CieXyChromaticityCoordinates right) => left.Equals(right);
///
/// Compares two objects for inequality
@@ -63,20 +60,14 @@ namespace SixLabors.ImageSharp.ColorSpaces
/// True if the current left is unequal to the parameter; otherwise, false.
///
[MethodImpl(InliningOptions.ShortMethod)]
- public static bool operator !=(CieXyChromaticityCoordinates left, CieXyChromaticityCoordinates right)
- {
- return !left.Equals(right);
- }
+ public static bool operator !=(CieXyChromaticityCoordinates left, CieXyChromaticityCoordinates right) => !left.Equals(right);
///
[MethodImpl(InliningOptions.ShortMethod)]
public override int GetHashCode() => HashHelpers.Combine(this.X.GetHashCode(), this.Y.GetHashCode());
///
- public override string ToString()
- {
- return $"CieXyChromaticityCoordinates [ X={this.X:#0.##}, Y={this.Y:#0.##}]";
- }
+ public override string ToString() => $"CieXyChromaticityCoordinates [ X={this.X:#0.##}, Y={this.Y:#0.##}]";
///
public override bool Equals(object obj) => obj is CieXyChromaticityCoordinates other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/CieXyy.cs b/src/ImageSharp/ColorSpaces/CieXyy.cs
index 831c35702..2b40c3039 100644
--- a/src/ImageSharp/ColorSpaces/CieXyy.cs
+++ b/src/ImageSharp/ColorSpaces/CieXyy.cs
@@ -91,16 +91,10 @@ namespace SixLabors.ImageSharp.ColorSpaces
}
///
- public override string ToString()
- {
- return $"CieXyy [ X={this.X:#0.##}, Y={this.Y:#0.##}, Yl={this.Yl:#0.##} ]";
- }
+ public override string ToString() => $"CieXyy [ X={this.X:#0.##}, Y={this.Y:#0.##}, Yl={this.Yl:#0.##} ]";
///
- public override bool Equals(object obj)
- {
- return obj is CieXyy other && this.Equals(other);
- }
+ public override bool Equals(object obj) => obj is CieXyy other && this.Equals(other);
///
[MethodImpl(InliningOptions.ShortMethod)]
diff --git a/src/ImageSharp/ColorSpaces/CieXyz.cs b/src/ImageSharp/ColorSpaces/CieXyz.cs
index a5d409f6b..b992a7a3e 100644
--- a/src/ImageSharp/ColorSpaces/CieXyz.cs
+++ b/src/ImageSharp/ColorSpaces/CieXyz.cs
@@ -2,7 +2,6 @@
// Licensed under the Apache License, Version 2.0.
using System;
-using System.ComponentModel;
using System.Numerics;
using System.Runtime.CompilerServices;
@@ -70,10 +69,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
/// True if the current left is equal to the parameter; otherwise, false.
///
[MethodImpl(InliningOptions.ShortMethod)]
- public static bool operator ==(CieXyz left, CieXyz right)
- {
- return left.Equals(right);
- }
+ public static bool operator ==(CieXyz left, CieXyz right) => left.Equals(right);
///
/// Compares two objects for inequality.
@@ -84,10 +80,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
/// True if the current left is unequal to the parameter; otherwise, false.
///
[MethodImpl(InliningOptions.ShortMethod)]
- public static bool operator !=(CieXyz left, CieXyz right)
- {
- return !left.Equals(right);
- }
+ public static bool operator !=(CieXyz left, CieXyz right) => !left.Equals(right);
///
/// Returns a new representing this instance.
@@ -105,10 +98,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
}
///
- public override string ToString()
- {
- return $"CieXyz [ X={this.X:#0.##}, Y={this.Y:#0.##}, Z={this.Z:#0.##} ]";
- }
+ public override string ToString() => $"CieXyz [ X={this.X:#0.##}, Y={this.Y:#0.##}, Z={this.Z:#0.##} ]";
///
public override bool Equals(object obj) => obj is CieXyz other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/Cmyk.cs b/src/ImageSharp/ColorSpaces/Cmyk.cs
index bc1131aa3..ea3c0b047 100644
--- a/src/ImageSharp/ColorSpaces/Cmyk.cs
+++ b/src/ImageSharp/ColorSpaces/Cmyk.cs
@@ -96,10 +96,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
}
///
- public override string ToString()
- {
- return $"Cmyk [ C={this.C:#0.##}, M={this.M:#0.##}, Y={this.Y:#0.##}, K={this.K:#0.##}]";
- }
+ public override string ToString() => $"Cmyk [ C={this.C:#0.##}, M={this.M:#0.##}, Y={this.Y:#0.##}, K={this.K:#0.##}]";
///
public override bool Equals(object obj) => obj is Cmyk other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLuv.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLuv.cs
index 5b41ba51e..b4d9ce08e 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLuv.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLuv.cs
@@ -4,7 +4,6 @@
using System;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-using SixLabors.ImageSharp.ColorSpaces;
using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation;
namespace SixLabors.ImageSharp.ColorSpaces.Conversion
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyy.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyy.cs
index b9958af49..b50f699af 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyy.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyy.cs
@@ -152,10 +152,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
///
/// The color to convert.
/// The
- public CieXyy ToCieXyy(in CieXyz color)
- {
- return CieXyzAndCieXyyConverter.Convert(color);
- }
+ public CieXyy ToCieXyy(in CieXyz color) => CieXyzAndCieXyyConverter.Convert(color);
///
/// Performs the bulk conversion from into
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Cmyk.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Cmyk.cs
index 8aaaad0ae..bc6c9a949 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Cmyk.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Cmyk.cs
@@ -383,10 +383,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
///
/// The color to convert.
/// The
- public Cmyk ToCmyk(in Rgb color)
- {
- return CmykAndRgbConverter.Convert(color);
- }
+ public Cmyk ToCmyk(in Rgb color) => CmykAndRgbConverter.Convert(color);
///
/// Performs the bulk conversion from into
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsl.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsl.cs
index a91f5a66d..d88c3a2f2 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsl.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsl.cs
@@ -383,10 +383,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
///
/// The color to convert.
/// The
- public Hsl ToHsl(in Rgb color)
- {
- return HslAndRgbConverter.Convert(color);
- }
+ public Hsl ToHsl(in Rgb color) => HslAndRgbConverter.Convert(color);
///
/// Performs the bulk conversion from into
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsv.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsv.cs
index c03239e16..01ade4375 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsv.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsv.cs
@@ -383,10 +383,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
///
/// The color to convert.
/// The
- public Hsv ToHsv(in Rgb color)
- {
- return HsvAndRgbConverter.Convert(color);
- }
+ public Hsv ToHsv(in Rgb color) => HsvAndRgbConverter.Convert(color);
///
/// Performs the bulk conversion from into
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Lms.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Lms.cs
index 840a99414..91162cb49 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Lms.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Lms.cs
@@ -177,10 +177,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
///
/// The color to convert.
/// The
- public Lms ToLms(in CieXyz color)
- {
- return this.cieXyzAndLmsConverter.Convert(color);
- }
+ public Lms ToLms(in CieXyz color) => this.cieXyzAndLmsConverter.Convert(color);
///
/// Performs the bulk conversion from into
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.YCbCr.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.YCbCr.cs
index 2521114fb..993108c40 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.YCbCr.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.YCbCr.cs
@@ -383,10 +383,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
///
/// The color to convert.
/// The
- public YCbCr ToYCbCr(in Rgb color)
- {
- return YCbCrAndRgbConverter.Convert(color);
- }
+ public YCbCr ToYCbCr(in Rgb color) => YCbCrAndRgbConverter.Convert(color);
///
/// Performs the bulk conversion from into
diff --git a/src/ImageSharp/ColorSpaces/Conversion/VonKriesChromaticAdaptation.cs b/src/ImageSharp/ColorSpaces/Conversion/VonKriesChromaticAdaptation.cs
index 306f013ed..bc840f746 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/VonKriesChromaticAdaptation.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/VonKriesChromaticAdaptation.cs
@@ -41,10 +41,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
/// Initializes a new instance of the class.
///
/// The color converter
- internal VonKriesChromaticAdaptation(CieXyzAndLmsConverter converter)
- {
- this.converter = converter;
- }
+ internal VonKriesChromaticAdaptation(CieXyzAndLmsConverter converter) => this.converter = converter;
///
public CieXyz Transform(in CieXyz sourceColor, in CieXyz sourceWhitePoint, in CieXyz targetWhitePoint)
diff --git a/src/ImageSharp/ColorSpaces/Hsl.cs b/src/ImageSharp/ColorSpaces/Hsl.cs
index c6e1e4f9d..111024167 100644
--- a/src/ImageSharp/ColorSpaces/Hsl.cs
+++ b/src/ImageSharp/ColorSpaces/Hsl.cs
@@ -94,10 +94,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
}
///
- public override string ToString()
- {
- return $"Hsl [ H={this.H:#0.##}, S={this.S:#0.##}, L={this.L:#0.##} ]";
- }
+ public override string ToString() => $"Hsl [ H={this.H:#0.##}, S={this.S:#0.##}, L={this.L:#0.##} ]";
///
public override bool Equals(object obj) => obj is Hsl other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/Hsv.cs b/src/ImageSharp/ColorSpaces/Hsv.cs
index 5fdc287ce..fdd34b1b4 100644
--- a/src/ImageSharp/ColorSpaces/Hsv.cs
+++ b/src/ImageSharp/ColorSpaces/Hsv.cs
@@ -2,12 +2,9 @@
// Licensed under the Apache License, Version 2.0.
using System;
-using System.ComponentModel;
using System.Numerics;
using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.PixelFormats;
-
namespace SixLabors.ImageSharp.ColorSpaces
{
///
@@ -95,10 +92,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
}
///
- public override string ToString()
- {
- return $"Hsv [ H={this.H:#0.##}, S={this.S:#0.##}, V={this.V:#0.##} ]";
- }
+ public override string ToString() => $"Hsv [ H={this.H:#0.##}, S={this.S:#0.##}, V={this.V:#0.##} ]";
///
public override bool Equals(object obj) => obj is Hsv other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/HunterLab.cs b/src/ImageSharp/ColorSpaces/HunterLab.cs
index d458fa789..9c7b45664 100644
--- a/src/ImageSharp/ColorSpaces/HunterLab.cs
+++ b/src/ImageSharp/ColorSpaces/HunterLab.cs
@@ -2,7 +2,6 @@
// Licensed under the Apache License, Version 2.0.
using System;
-using System.ComponentModel;
using System.Numerics;
using System.Runtime.CompilerServices;
@@ -127,10 +126,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
}
///
- public override string ToString()
- {
- return $"HunterLab [ L={this.L:#0.##}, A={this.A:#0.##}, B={this.B:#0.##}]";
- }
+ public override string ToString() => $"HunterLab [ L={this.L:#0.##}, A={this.A:#0.##}, B={this.B:#0.##}]";
///
public override bool Equals(object obj) => obj is HunterLab other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/LinearRgb.cs b/src/ImageSharp/ColorSpaces/LinearRgb.cs
index e7c74cb2d..d055afc80 100644
--- a/src/ImageSharp/ColorSpaces/LinearRgb.cs
+++ b/src/ImageSharp/ColorSpaces/LinearRgb.cs
@@ -131,10 +131,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
}
///
- public override string ToString()
- {
- return $"LinearRgb [ R={this.R:#0.##}, G={this.G:#0.##}, B={this.B:#0.##} ]";
- }
+ public override string ToString() => $"LinearRgb [ R={this.R:#0.##}, G={this.G:#0.##}, B={this.B:#0.##} ]";
///
public override bool Equals(object obj) => obj is LinearRgb other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/Lms.cs b/src/ImageSharp/ColorSpaces/Lms.cs
index 0204a0ebc..becfea341 100644
--- a/src/ImageSharp/ColorSpaces/Lms.cs
+++ b/src/ImageSharp/ColorSpaces/Lms.cs
@@ -97,10 +97,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
}
///
- public override string ToString()
- {
- return $"Lms [ L={this.L:#0.##}, M={this.M:#0.##}, S={this.S:#0.##} ]";
- }
+ public override string ToString() => $"Lms [ L={this.L:#0.##}, M={this.M:#0.##}, S={this.S:#0.##} ]";
///
public override bool Equals(object obj) => obj is Lms other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/Rgb.cs b/src/ImageSharp/ColorSpaces/Rgb.cs
index 91a6b23d4..e75de117c 100644
--- a/src/ImageSharp/ColorSpaces/Rgb.cs
+++ b/src/ImageSharp/ColorSpaces/Rgb.cs
@@ -104,10 +104,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
/// The instance of to convert.
/// An instance of .
[MethodImpl(InliningOptions.ShortMethod)]
- public static implicit operator Rgb(Rgb24 color)
- {
- return new Rgb(color.R / 255F, color.G / 255F, color.B / 255F);
- }
+ public static implicit operator Rgb(Rgb24 color) => new Rgb(color.R / 255F, color.G / 255F, color.B / 255F);
///
/// Allows the implicit conversion of an instance of to a
@@ -116,10 +113,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
/// The instance of to convert.
/// An instance of .
[MethodImpl(InliningOptions.ShortMethod)]
- public static implicit operator Rgb(Rgba32 color)
- {
- return new Rgb(color.R / 255F, color.G / 255F, color.B / 255F);
- }
+ public static implicit operator Rgb(Rgba32 color) => new Rgb(color.R / 255F, color.G / 255F, color.B / 255F);
///
/// Compares two objects for equality.
@@ -163,10 +157,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
}
///
- public override string ToString()
- {
- return $"Rgb [ R={this.R:#0.##}, G={this.G:#0.##}, B={this.B:#0.##} ]";
- }
+ public override string ToString() => $"Rgb [ R={this.R:#0.##}, G={this.G:#0.##}, B={this.B:#0.##} ]";
///
public override bool Equals(object obj) => obj is Rgb other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/YCbCr.cs b/src/ImageSharp/ColorSpaces/YCbCr.cs
index 0d426f3c2..a1514505a 100644
--- a/src/ImageSharp/ColorSpaces/YCbCr.cs
+++ b/src/ImageSharp/ColorSpaces/YCbCr.cs
@@ -93,10 +93,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
}
///
- public override string ToString()
- {
- return $"YCbCr [ Y={this.Y}, Cb={this.Cb}, Cr={this.Cr} ]";
- }
+ public override string ToString() => $"YCbCr [ Y={this.Y}, Cb={this.Cb}, Cr={this.Cr} ]";
///
public override bool Equals(object obj) => obj is YCbCr other && this.Equals(other);
diff --git a/src/ImageSharp/PixelFormats/Rgba32.cs b/src/ImageSharp/PixelFormats/Rgba32.cs
index 623c58d08..7349639fd 100644
--- a/src/ImageSharp/PixelFormats/Rgba32.cs
+++ b/src/ImageSharp/PixelFormats/Rgba32.cs
@@ -111,10 +111,7 @@ namespace SixLabors.ImageSharp.PixelFormats
/// The alpha component.
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public Rgba32(float r, float g, float b, float a = 1)
- : this()
- {
- this.Pack(r, g, b, a);
- }
+ : this() => this.Pack(r, g, b, a);
///
/// Initializes a new instance of the struct.
@@ -124,10 +121,7 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public Rgba32(Vector3 vector)
- : this()
- {
- this.Pack(ref vector);
- }
+ : this() => this.Pack(ref vector);
///
/// Initializes a new instance of the struct.
@@ -137,10 +131,7 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public Rgba32(Vector4 vector)
- : this()
- {
- this = PackNew(ref vector);
- }
+ : this() => this = PackNew(ref vector);
///
/// Initializes a new instance of the struct.
@@ -150,10 +141,7 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public Rgba32(uint packed)
- : this()
- {
- this.Rgba = packed;
- }
+ : this() => this.Rgba = packed;
///
/// Gets or sets the packed representation of the Rgba32 struct.
@@ -230,10 +218,7 @@ namespace SixLabors.ImageSharp.PixelFormats
/// True if the parameter is equal to the parameter; otherwise, false.
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public static bool operator ==(Rgba32 left, Rgba32 right)
- {
- return left.Rgba == right.Rgba;
- }
+ public static bool operator ==(Rgba32 left, Rgba32 right) => left.Rgba == right.Rgba;
///
/// Compares two objects for equality.
@@ -244,10 +229,7 @@ namespace SixLabors.ImageSharp.PixelFormats
/// True if the parameter is not equal to the parameter; otherwise, false.
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public static bool operator !=(Rgba32 left, Rgba32 right)
- {
- return left.Rgba != right.Rgba;
- }
+ public static bool operator !=(Rgba32 left, Rgba32 right) => left.Rgba != right.Rgba;
///
/// Creates a new instance of the struct.
@@ -259,20 +241,14 @@ namespace SixLabors.ImageSharp.PixelFormats
///
/// The .
///
- public static Rgba32 FromHex(string hex)
- {
- return ColorBuilder.FromHex(hex);
- }
+ public static Rgba32 FromHex(string hex) => ColorBuilder.FromHex(hex);
///
public PixelOperations CreatePixelOperations() => new PixelOperations();
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromRgba32(Rgba32 source)
- {
- this = source;
- }
+ public void PackFromRgba32(Rgba32 source) => this = source;
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -306,17 +282,11 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgb24(ref Rgb24 dest)
- {
- dest = Unsafe.As(ref this);
- }
+ public void ToRgb24(ref Rgb24 dest) => dest = Unsafe.As(ref this);
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void ToRgba32(ref Rgba32 dest)
- {
- dest = this;
- }
+ public void ToRgba32(ref Rgba32 dest) => dest = this;
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -349,31 +319,19 @@ namespace SixLabors.ImageSharp.PixelFormats
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromScaledVector4(Vector4 vector)
- {
- this.PackFromVector4(vector);
- }
+ public void PackFromScaledVector4(Vector4 vector) => this.PackFromVector4(vector);
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public Vector4 ToScaledVector4()
- {
- return this.ToVector4();
- }
+ public Vector4 ToScaledVector4() => this.ToVector4();
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public void PackFromVector4(Vector4 vector)
- {
- this.Pack(ref vector);
- }
+ public void PackFromVector4(Vector4 vector) => this.Pack(ref vector);
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public Vector4 ToVector4()
- {
- return new Vector4(this.R, this.G, this.B, this.A) / MaxBytes;
- }
+ public Vector4 ToVector4() => new Vector4(this.R, this.G, this.B, this.A) / MaxBytes;
///
/// Gets the value of this struct as .
@@ -428,23 +386,14 @@ namespace SixLabors.ImageSharp.PixelFormats
public void ToRgba64(ref Rgba64 dest) => dest.PackFromScaledVector4(this.ToScaledVector4());
///
- public override bool Equals(object obj)
- {
- return obj is Rgba32 rgba32 && this.Equals(rgba32);
- }
+ public override bool Equals(object obj) => obj is Rgba32 rgba32 && this.Equals(rgba32);
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public bool Equals(Rgba32 other)
- {
- return this.Rgba == other.Rgba;
- }
+ public bool Equals(Rgba32 other) => this.Rgba == other.Rgba;
///
- public override string ToString()
- {
- return $"({this.R},{this.G},{this.B},{this.A})";
- }
+ public override string ToString() => $"({this.R},{this.G},{this.B},{this.A})";
///
[MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -455,10 +404,7 @@ namespace SixLabors.ImageSharp.PixelFormats
///
/// A of values in [0, 255]
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- internal Vector4 ToByteScaledVector4()
- {
- return new Vector4(this.R, this.G, this.B, this.A);
- }
+ internal Vector4 ToByteScaledVector4() => new Vector4(this.R, this.G, this.B, this.A);
///
/// Packs a into a color returning a new instance as a result.
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/StringRepresentationTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/StringRepresentationTests.cs
new file mode 100644
index 000000000..580e6cb4e
--- /dev/null
+++ b/tests/ImageSharp.Tests/Colorspaces/Conversion/StringRepresentationTests.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.Numerics;
+using SixLabors.ImageSharp.ColorSpaces;
+using Xunit;
+
+namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
+{
+ public class StringRepresentationTests
+ {
+ private static readonly Vector3 one = new Vector3(1);
+ private static readonly Vector3 zero = new Vector3(0);
+ private static readonly Vector3 random = new Vector3(42.4F, 94.5F, 83.4F);
+
+ public static readonly TheoryData