Update to c#6 syntax, make structs immutable

Former-commit-id: 422cca4d32fcde728b090058088408d56fd4cbb0
Former-commit-id: 8d29aadde9a6b84d9d873b14142907e8228da4cc
Former-commit-id: 79aba44ef77760b6d58bfa7cdaf59060c6041be5

src/ImageProcessor/Colors/Bgra.cs

@@ -44,31 +44,31 @@ namespace ImageProcessor
         /// Holds the blue component of the color
         /// </summary>
         [FieldOffset(0)]
-        public byte B;
+        public readonly byte B;
 
         /// <summary>
         /// Holds the green component of the color
         /// </summary>
         [FieldOffset(1)]
-        public byte G;
+        public readonly byte G;
 
         /// <summary>
         /// Holds the red component of the color
         /// </summary>
         [FieldOffset(2)]
-        public byte R;
+        public readonly byte R;
 
         /// <summary>
         /// Holds the alpha component of the color
         /// </summary>
         [FieldOffset(3)]
-        public byte A;
+        public readonly byte A;
 
         /// <summary>
         /// Permits the <see cref="Bgra"/> to be treated as a 32 bit integer.
         /// </summary>
         [FieldOffset(0)]
-        public int BGRA;
+        public readonly int BGRA;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Bgra"/> struct.
@@ -142,7 +142,7 @@ namespace ImageProcessor
 
             if (hex.Length != 8 && hex.Length != 6 && hex.Length != 3)
             {
-                throw new ArgumentException("Hexadecimal string is not in the correct format.", "hex");
+                throw new ArgumentException("Hexadecimal string is not in the correct format.", nameof(hex));
             }
 
             if (hex.Length == 8)
@@ -176,13 +176,7 @@ namespace ImageProcessor
         /// Gets a value indicating whether this <see cref="Bgra"/> is empty.
         /// </summary>
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty
-        {
-            get
-            {
-                return this.B == 0 && this.G == 0 && this.R == 0 && this.A == 0;
-            }
-        }
+        public bool IsEmpty => this.B == 0 && this.G == 0 && this.R == 0 && this.A == 0;
 
         /// <summary>
         /// Compares two <see cref="Bgra"/> objects. The result specifies whether the values
@@ -249,7 +243,14 @@ namespace ImageProcessor
         /// </returns>
         public override int GetHashCode()
         {
-            return this.GetHashCode(this);
+            unchecked
+            {
+                int hashCode = this.B.GetHashCode();
+                hashCode = (hashCode * 397) ^ this.G.GetHashCode();
+                hashCode = (hashCode * 397) ^ this.R.GetHashCode();
+                hashCode = (hashCode * 397) ^ this.A.GetHashCode();
+                return hashCode;
+            }
         }
 
         /// <summary>
@@ -265,7 +266,7 @@ namespace ImageProcessor
                 return "Color [ Empty ]";
             }
 
-            return string.Format("Color [ B={0}, G={1}, R={2}, A={3} ]", this.B, this.G, this.R, this.A);
+            return $"Color [ B={this.B}, G={this.G}, R={this.R}, A={this.A} ]";
         }
 
         /// <summary>
@@ -277,29 +278,7 @@ namespace ImageProcessor
         /// <param name="other">An object to compare with this object.</param>
         public bool Equals(Bgra other)
         {
-            return this.B.Equals(other.B) && this.G.Equals(other.G)
-                && this.R.Equals(other.R) && this.A.Equals(other.A);
-        }
-
-        /// <summary>
-        /// Returns the hash code for the given instance.
-        /// </summary>
-        /// <param name="color">
-        /// The instance of <see cref="Bgra"/> to return the hash code for.
-        /// </param>
-        /// <returns>
-        /// A 32-bit signed integer that is the hash code for this instance.
-        /// </returns>
-        private int GetHashCode(Bgra color)
-        {
-            unchecked
-            {
-                int hashCode = color.B.GetHashCode();
-                hashCode = (hashCode * 397) ^ color.G.GetHashCode();
-                hashCode = (hashCode * 397) ^ color.R.GetHashCode();
-                hashCode = (hashCode * 397) ^ color.A.GetHashCode();
-                return hashCode;
-            }
+            return this.BGRA == other.BGRA;
         }
     }
 }

src/ImageProcessor/Colors/YCbCr.cs

@@ -31,19 +31,19 @@ namespace ImageProcessor
         /// Holds the Y luminance component.
         /// <remarks>A value ranging between 0 and 255.</remarks>
         /// </summary>
-        public float Y;
+        public float Y { get; }
 
         /// <summary>
         /// Holds the Cb chroma component.
         /// <remarks>A value ranging between 0 and 255.</remarks>
         /// </summary>
-        public float Cb;
+        public float Cb { get; }
 
         /// <summary>
         /// Holds the Cr chroma component.
         /// <remarks>A value ranging between 0 and 255.</remarks>
         /// </summary>
-        public float Cr;
+        public float Cr { get; }
 
         /// <summary>
         /// The epsilon for comparing floating point numbers.
@@ -67,15 +67,9 @@ namespace ImageProcessor
         /// Gets a value indicating whether this <see cref="YCbCr"/> is empty.
         /// </summary>
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty
-        {
-            get
-            {
-                return Math.Abs(this.Y) < Epsilon
-                    && Math.Abs(this.Cb) < Epsilon
-                    && Math.Abs(this.Cr) < Epsilon;
-            }
-        }
+        public bool IsEmpty => Math.Abs(this.Y) < Epsilon
+                               && Math.Abs(this.Cb) < Epsilon
+                               && Math.Abs(this.Cr) < Epsilon;
 
         /// <summary>
         /// Compares two <see cref="YCbCr"/> objects. The result specifies whether the values
@@ -190,7 +184,13 @@ namespace ImageProcessor
         /// </returns>
         public override int GetHashCode()
         {
-            return this.GetHashCode(this);
+            unchecked
+            {
+                int hashCode = this.Y.GetHashCode();
+                hashCode = (hashCode * 397) ^ this.Cb.GetHashCode();
+                hashCode = (hashCode * 397) ^ this.Cr.GetHashCode();
+                return hashCode;
+            }
         }
 
         /// <summary>
@@ -206,7 +206,7 @@ namespace ImageProcessor
                 return "YCbCrColor [ Empty ]";
             }
 
-            return string.Format("YCbCrColor [ Y={0:#0.##}, Cb={1:#0.##}, Cr={2:#0.##} ]", this.Y, this.Cb, this.Cr);
+            return $"YCbCrColor [ Y={this.Y:#0.##}, Cb={this.Cb:#0.##}, Cr={this.Cr:#0.##} ]";
         }
 
         /// <summary>
@@ -222,25 +222,5 @@ namespace ImageProcessor
                 && this.Cb.Equals(other.Cb)
                 && this.Cr.Equals(other.Cr);
         }
-
-        /// <summary>
-        /// Returns the hash code for the given instance.
-        /// </summary>
-        /// <param name="color">
-        /// The instance of <see cref="Bgra"/> to return the hash code for.
-        /// </param>
-        /// <returns>
-        /// A 32-bit signed integer that is the hash code for this instance.
-        /// </returns>
-        private int GetHashCode(YCbCr color)
-        {
-            unchecked
-            {
-                int hashCode = color.Y.GetHashCode();
-                hashCode = (hashCode * 397) ^ color.Cb.GetHashCode();
-                hashCode = (hashCode * 397) ^ color.Cr.GetHashCode();
-                return hashCode;
-            }
-        }
     }
 }

src/ImageProcessor/Common/Helpers/Guard.cs

@@ -91,7 +91,7 @@ namespace ImageProcessor
             {
                 throw new ArgumentOutOfRangeException(
                     parameterName,
-                    string.Format(CultureInfo.CurrentCulture, "Value must be less than {0}.", max));
+                    $"Value must be less than {max}.");
             }
         }
 
@@ -112,7 +112,7 @@ namespace ImageProcessor
             {
                 throw new ArgumentOutOfRangeException(
                     parameterName,
-                    string.Format(CultureInfo.CurrentCulture, "Value must be less than or equal to {0}.", max));
+                    $"Value must be less than or equal to {max}.");
             }
         }
 
@@ -133,7 +133,7 @@ namespace ImageProcessor
             {
                 throw new ArgumentOutOfRangeException(
                     parameterName,
-                    string.Format(CultureInfo.CurrentCulture, "Value must be greater than {0}.", min));
+                    $"Value must be greater than {min}.");
             }
         }
 
@@ -154,7 +154,7 @@ namespace ImageProcessor
             {
                 throw new ArgumentOutOfRangeException(
                     parameterName,
-                    string.Format(CultureInfo.CurrentCulture, "Value must be greater than or equal to {0}.", min));
+                    $"Value must be greater than or equal to {min}.");
             }
         }
 
@@ -176,7 +176,7 @@ namespace ImageProcessor
             {
                 throw new ArgumentOutOfRangeException(
                     parameterName,
-                    string.Format(CultureInfo.CurrentCulture, "Value must be greater than or equal to {0} and less than or equal to {1}.", min, max));
+                    $"Value must be greater than or equal to {min} and less than or equal to {max}.");
             }
         }
     }

src/ImageProcessor/Formats/Bmp/BmpDecoder.cs

@@ -34,13 +34,7 @@ namespace ImageProcessor.Formats
         /// Gets the size of the header for this image type.
         /// </summary>
         /// <value>The size of the header.</value>
-        public int HeaderSize
-        {
-            get
-            {
-                return 2;
-            }
-        }
+        public int HeaderSize => 2;
 
         /// <summary>
         /// Returns a value indicating whether the <see cref="IImageDecoder"/> supports the specified

src/ImageProcessor/Formats/Bmp/BmpDecoderCore.cs

@@ -33,8 +33,6 @@ namespace ImageProcessor.Formats
         /// </summary>
         private const int Rgb16BMask = 0x0000001F;
 
-        #region Fields
-
         /// <summary>
         /// The stream to decode from.
         /// </summary>
@@ -51,10 +49,6 @@ namespace ImageProcessor.Formats
         /// </summary>
         private BmpInfoHeader infoHeader;
 
-        #endregion
-
-        #region IImageDecoder Members
-
         /// <summary>
         /// Decodes the image from the specified this._stream and sets
         /// the data to image.
@@ -99,8 +93,7 @@ namespace ImageProcessor.Formats
                 {
                     if (colorMapSize > 255 * 4)
                     {
-                        throw new ImageFormatException(
-                            string.Format("Invalid bmp colormap size '{0}'", colorMapSize));
+                        throw new ImageFormatException($"Invalid bmp colormap size '{colorMapSize}'");
                     }
 
                     palette = new byte[colorMapSize];
@@ -111,12 +104,8 @@ namespace ImageProcessor.Formats
                 if (this.infoHeader.Width > ImageBase.MaxWidth || this.infoHeader.Height > ImageBase.MaxHeight)
                 {
                     throw new ArgumentOutOfRangeException(
-                        string.Format(
-                            "The input bitmap '{0}x{1}' is bigger then the max allowed size '{2}x{3}'",
-                            this.infoHeader.Width,
-                            this.infoHeader.Height,
-                            ImageBase.MaxWidth,
-                            ImageBase.MaxHeight));
+                        $"The input bitmap '{this.infoHeader.Width}x{this.infoHeader.Height}' is "
+                        + $"bigger then the max allowed size '{ImageBase.MaxWidth}x{ImageBase.MaxHeight}'");
                 }
 
                 byte[] imageData = new byte[this.infoHeader.Width * this.infoHeader.Height * 4];
@@ -127,7 +116,7 @@ namespace ImageProcessor.Formats
                         if (this.infoHeader.HeaderSize != 40)
                         {
                             throw new ImageFormatException(
-                                string.Format("Header Size value '{0}' is not valid.", this.infoHeader.HeaderSize));
+                                $"Header Size value '{this.infoHeader.HeaderSize}' is not valid.");
                         }
 
                         if (this.infoHeader.BitsPerPixel == 32)
@@ -416,7 +405,5 @@ namespace ImageProcessor.Formats
                 Offset = BitConverter.ToInt32(data, 10)
             };
         }
-
-        #endregion
     }
 }

src/ImageProcessor/Formats/Bmp/BmpEncoder.cs

@@ -28,10 +28,7 @@ namespace ImageProcessor.Formats
         /// <summary>
         /// Gets the default file extension for this encoder.
         /// </summary>
-        public string Extension
-        {
-            get { return "BMP"; }
-        }
+        public string Extension => "BMP";
 
         /// <summary>
         /// Returns a value indicating whether the <see cref="IImageEncoder"/> supports the specified

src/ImageProcessor/Formats/Png/PngDecoder.cs

@@ -39,13 +39,7 @@ namespace ImageProcessor.Formats
         /// Gets the size of the header for this image type.
         /// </summary>
         /// <value>The size of the header.</value>
-        public int HeaderSize
-        {
-            get
-            {
-                return 8;
-            }
-        }
+        public int HeaderSize => 8;
 
         /// <summary>
         /// Returns a value indicating whether the <see cref="IImageDecoder"/> supports the specified

src/ImageProcessor/Formats/Png/PngDecoderCore.cs

@@ -157,12 +157,8 @@ namespace ImageProcessor.Formats
                 if (this.header.Width > ImageBase.MaxWidth || this.header.Height > ImageBase.MaxHeight)
                 {
                     throw new ArgumentOutOfRangeException(
-                        string.Format(
-                            "The input png '{0}x{1}' is bigger then the max allowed size '{2}x{3}'",
-                            this.header.Width,
-                            this.header.Height,
-                            ImageBase.MaxWidth,
-                            ImageBase.MaxHeight));
+                        $"The input png '{this.header.Width}x{this.header.Height}' is bigger thean the "
+                        + $"max allowed size '{ImageBase.MaxWidth}x{ImageBase.MaxHeight}'");
                 }
 
                 byte[] pixels = new byte[this.header.Width * this.header.Height * 4];
@@ -483,11 +479,7 @@ namespace ImageProcessor.Formats
         {
             if (chunk.Length > MaxChunkSize)
             {
-                throw new ArgumentOutOfRangeException(
-                    string.Format(
-                    "Png chunk size '{0}' exceeds the '{1}'",
-                    chunk.Length,
-                    MaxChunkSize));
+                throw new ArgumentOutOfRangeException($"Png chunk size '{chunk.Length}' exceeds the maximum '{MaxChunkSize}'");
             }
 
             chunk.Data = new byte[chunk.Length];

src/ImageProcessor/Formats/Png/PngEncoder.cs

@@ -72,10 +72,7 @@ namespace ImageProcessor.Formats
         /// Gets the default file extension for this encoder.
         /// </summary>
         /// <value>The default file extension for this encoder.</value>
-        public string Extension
-        {
-            get { return "PNG"; }
-        }
+        public string Extension => "PNG";
 
         /// <summary>
         /// Indicates if the image encoder supports the specified
@@ -389,10 +386,7 @@ namespace ImageProcessor.Formats
             }
             finally
             {
-                if (memoryStream != null)
-                {
-                    memoryStream.Dispose();
-                }
+                memoryStream?.Dispose();
             }
 
             int numChunks = bufferLength / MaxBlockSize;
@@ -453,7 +447,7 @@ namespace ImageProcessor.Formats
         /// <param name="data">The <see cref="T:byte[]"/> containing data.</param>
         private void WriteChunk(Stream stream, string type, byte[] data)
         {
-            this.WriteChunk(stream, type, data, 0, data != null ? data.Length : 0);
+            this.WriteChunk(stream, type, data, 0, data?.Length ?? 0);
         }
 
         /// <summary>

src/ImageProcessor/Image.cs

@@ -18,7 +18,7 @@ namespace ImageProcessor
     using System.Linq;
     using System.Text;
 
-    using ImageProcessor.Formats;
+    using Formats;
 
     /// <summary>
     /// Image class which stores the pixels and provides common functionality
@@ -66,16 +66,6 @@ namespace ImageProcessor
             new PngEncoder(),
         });
 
-        /// <summary>
-        /// The collection of image frames.
-        /// </summary>
-        private readonly IList<ImageFrame> frames = new List<ImageFrame>();
-
-        /// <summary>
-        /// The collection of image properties.
-        /// </summary>
-        private readonly IList<ImageProperty> properties = new List<ImageProperty>();
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Image"/> class.
         /// </summary>
@@ -152,18 +142,12 @@ namespace ImageProcessor
         /// <summary>
         /// Gets a list of default decoders.
         /// </summary>
-        public static IList<IImageDecoder> Decoders
-        {
-            get { return DefaultDecoders.Value; }
-        }
+        public static IList<IImageDecoder> Decoders => DefaultDecoders.Value;
 
         /// <summary>
         /// Gets a list of default encoders.
         /// </summary>
-        public static IList<IImageEncoder> Encoders
-        {
-            get { return DefaultEncoders.Value; }
-        }
+        public static IList<IImageEncoder> Encoders => DefaultEncoders.Value;
 
         /// <summary>
         /// Gets or sets the frame delay.
@@ -236,28 +220,19 @@ namespace ImageProcessor
         /// <value>
         /// <c>true</c> if this image is animated; otherwise, <c>false</c>.
         /// </value>
-        public bool IsAnimated
-        {
-            get { return this.frames.Count > 0; }
-        }
+        public bool IsAnimated => this.Frames.Count > 0;
 
         /// <summary>
         /// Gets the other frames for the animation.
         /// </summary>
         /// <value>The list of frame images.</value>
-        public IList<ImageFrame> Frames
-        {
-            get { return this.frames; }
-        }
+        public IList<ImageFrame> Frames { get; } = new List<ImageFrame>();
 
         /// <summary>
         /// Gets the list of properties for storing meta information about this image.
         /// </summary>
         /// <value>A list of image properties.</value>
-        public IList<ImageProperty> Properties
-        {
-            get { return this.properties; }
-        }
+        public IList<ImageProperty> Properties { get; } = new List<ImageProperty>();
 
         /// <summary>
         /// Loads the image from the given stream.

src/ImageProcessor/ImageBase.cs

@@ -19,16 +19,6 @@ namespace ImageProcessor
     /// </summary>
     public abstract class ImageBase
     {
-        /// <summary>
-        /// The maximum allowable width in pixels.
-        /// </summary>
-        private static int maxWidth = int.MaxValue;
-
-        /// <summary>
-        /// The maximum allowable height in pixels.
-        /// </summary>
-        private static int maxHeight = int.MaxValue;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageBase"/> class.
         /// </summary>
@@ -83,34 +73,12 @@ namespace ImageProcessor
         /// <summary>
         /// Gets or sets the maximum allowable width in pixels.
         /// </summary>
-        public static int MaxWidth
-        {
-            get
-            {
-                return maxWidth;
-            }
-
-            set
-            {
-                maxWidth = value;
-            }
-        }
+        public static int MaxWidth { get; set; } = int.MaxValue;
 
         /// <summary>
         /// Gets or sets the maximum allowable height in pixels.
         /// </summary>
-        public static int MaxHeight
-        {
-            get
-            {
-                return maxHeight;
-            }
-
-            set
-            {
-                maxHeight = value;
-            }
-        }
+        public static int MaxHeight { get; set; } = int.MaxValue;
 
         /// <summary>
         /// Gets the image pixels as byte array.
@@ -135,21 +103,12 @@ namespace ImageProcessor
         /// <summary>
         /// Gets the pixel ratio made up of the width and height.
         /// </summary>
-        public double PixelRatio
-        {
-            get { return (double)this.Width / this.Height; }
-        }
+        public double PixelRatio => (double)this.Width / this.Height;
 
         /// <summary>
         /// Gets the <see cref="Rectangle"/> representing the bounds of the image.
         /// </summary>
-        public Rectangle Bounds
-        {
-            get
-            {
-                return new Rectangle(0, 0, this.Width, this.Height);
-            }
-        }
+        public Rectangle Bounds => new Rectangle(0, 0, this.Width, this.Height);
 
         /// <summary>
         /// Gets or sets the color of a pixel at the specified position.
@@ -170,12 +129,12 @@ namespace ImageProcessor
 #if DEBUG
                 if ((x < 0) || (x >= this.Width))
                 {
-                    throw new ArgumentOutOfRangeException("x", "Value cannot be less than zero or greater than the bitmap width.");
+                    throw new ArgumentOutOfRangeException(nameof(x), "Value cannot be less than zero or greater than the bitmap width.");
                 }
 
                 if ((y < 0) || (y >= this.Width))
                 {
-                    throw new ArgumentOutOfRangeException("y", "Value cannot be less than zero or greater than the bitmap height.");
+                    throw new ArgumentOutOfRangeException(nameof(y), "Value cannot be less than zero or greater than the bitmap height.");
                 }
 #endif
 
@@ -188,12 +147,12 @@ namespace ImageProcessor
 #if DEBUG
                 if ((x < 0) || (x >= this.Width))
                 {
-                    throw new ArgumentOutOfRangeException("x", "Value cannot be less than zero or greater than the bitmap width.");
+                    throw new ArgumentOutOfRangeException(nameof(x), "Value cannot be less than zero or greater than the bitmap width.");
                 }
 
                 if ((y < 0) || (y >= this.Width))
                 {
-                    throw new ArgumentOutOfRangeException("y", "Value cannot be less than zero or greater than the bitmap height.");
+                    throw new ArgumentOutOfRangeException(nameof(y), "Value cannot be less than zero or greater than the bitmap height.");
                 }
 #endif
 
@@ -226,12 +185,12 @@ namespace ImageProcessor
         {
             if (width <= 0)
             {
-                throw new ArgumentOutOfRangeException("width", "Width must be greater than or equals than zero.");
+                throw new ArgumentOutOfRangeException(nameof(width), "Width must be greater than or equals than zero.");
             }
 
             if (height <= 0)
             {
-                throw new ArgumentOutOfRangeException("height", "Height must be greater than or equal than zero.");
+                throw new ArgumentOutOfRangeException(nameof(height), "Height must be greater than or equal than zero.");
             }
 
             if (pixels.Length != width * height * 4)

src/ImageProcessor/ImageProperty.cs

@@ -22,19 +22,19 @@ namespace ImageProcessor
     public struct ImageProperty : IEquatable<ImageProperty>
     {
         /// <summary>
-        /// The name of this <see cref="ImageProperty"/> indicating which kind of 
+        /// Gets the name of this <see cref="ImageProperty"/> indicating which kind of 
         /// information this property stores.
         /// </summary>
         /// <example>
         /// Typical properties are the author, copyright
         /// information or other meta information.
         /// </example>
-        public string Name;
+        public string Name { get; }
 
         /// <summary>
         /// The value of this <see cref="ImageProperty"/>.
         /// </summary>
-        public string Value;
+        public string Value { get; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageProperty"/> struct.
@@ -119,7 +119,12 @@ namespace ImageProcessor
         /// </returns>
         public override int GetHashCode()
         {
-            return this.GetHashCode(this);
+            unchecked
+            {
+                int hashCode = this.Name.GetHashCode();
+                hashCode = (hashCode * 397) ^ this.Value.GetHashCode();
+                return hashCode;
+            }
         }
 
         /// <summary>
@@ -130,7 +135,7 @@ namespace ImageProcessor
         /// </returns>
         public override string ToString()
         {
-            return "{Name=" + this.Name + ",Value=" + this.Value + "}";
+            return $"ImageProperty [ Name={this.Name}, Value={this.Value} ]";
         }
 
         /// <summary>
@@ -144,24 +149,5 @@ namespace ImageProcessor
         {
             return this.Name.Equals(other.Name) && this.Value.Equals(other.Value);
         }
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <param name="imageProperty">
-        /// The instance of <see cref="ImageProperty"/> to return the hash code for.
-        /// </param>
-        /// <returns>
-        /// A 32-bit signed integer that is the hash code for this instance.
-        /// </returns>
-        private int GetHashCode(ImageProperty imageProperty)
-        {
-            unchecked
-            {
-                int hashCode = imageProperty.Name.GetHashCode();
-                hashCode = (hashCode * 397) ^ imageProperty.Value.GetHashCode();
-                return hashCode;
-            }
-        }
     }
 }

src/ImageProcessor/Numerics/Point.cs

@@ -17,10 +17,25 @@ namespace ImageProcessor
 
     /// <summary>
     /// Represents an ordered pair of integer x- and y-coordinates that defines a point in 
-    /// a two-dimensional plane.
+    /// a two-dimensional plane. 
     /// </summary>
+    /// <remarks>
+    /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance, 
+    /// as it avoids the need to create new values for modification operations.
+    /// </remarks>
     public struct Point : IEquatable<Point>
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Point"/> struct.
+        /// </summary>
+        /// <param name="x">The horizontal position of the point.</param>
+        /// <param name="y">The vertical position of the point.</param>
+        public Point(int x, int y)
+        {
+            this.X = x;
+            this.Y = y;
+        }
+
         /// <summary>
         /// Represents a <see cref="Point"/> that has X and Y values set to zero.
         /// </summary>
@@ -29,39 +44,18 @@ namespace ImageProcessor
         /// <summary>
         /// The x-coordinate of this <see cref="Point"/>.
         /// </summary>
-        public int X;
+        public int X { get; set; }
 
         /// <summary>
         /// The y-coordinate of this <see cref="Point"/>.
         /// </summary>
-        public int Y;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Point"/> struct.
-        /// </summary>
-        /// <param name="x">
-        /// The horizontal position of the point. 
-        /// </param>
-        /// <param name="y">
-        /// The vertical position of the point. 
-        /// </param>
-        public Point(int x, int y)
-        {
-            this.X = x;
-            this.Y = y;
-        }
+        public int Y { get; set; }
 
         /// <summary>
         /// Gets a value indicating whether this <see cref="Point"/> is empty.
         /// </summary>
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty
-        {
-            get
-            {
-                return this.X == 0 && this.Y == 0;
-            }
-        }
+        public bool IsEmpty => this.X == 0 && this.Y == 0;
 
         /// <summary>
         /// Compares two <see cref="Point"/> objects. The result specifies whether the values
@@ -142,7 +136,13 @@ namespace ImageProcessor
         /// </returns>
         public override string ToString()
         {
-            return "{X=" + this.X.ToString(CultureInfo.CurrentCulture) + ",Y=" + this.Y.ToString(CultureInfo.CurrentCulture) + "}";
+            if (this.IsEmpty)
+            {
+                return "Point [ Empty ]";
+            }
+
+            return
+                $"Point [ X={this.X.ToString(CultureInfo.CurrentCulture)}, Y={this.Y.ToString(CultureInfo.CurrentCulture)} ]";
         }
 
         /// <summary>

src/ImageProcessor/Numerics/Rectangle.cs

@@ -17,48 +17,19 @@ namespace ImageProcessor
     /// <summary>
     /// Stores a set of four integers that represent the location and size of a rectangle.
     /// </summary>
+    /// <remarks>
+    /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance, 
+    /// as it avoids the need to create new values for modification operations.
+    /// </remarks>
     public struct Rectangle : IEquatable<Rectangle>
     {
-        /// <summary>
-        /// Represents a <see cref="Rectangle"/> that has X, Y, Width, and Height values set to zero.
-        /// </summary>
-        public static readonly Rectangle Empty = new Rectangle();
-
-        /// <summary>
-        /// The x-coordinate of this <see cref="Rectangle"/>.
-        /// </summary>
-        public int X;
-
-        /// <summary>
-        /// The y-coordinate of this <see cref="Rectangle"/>.
-        /// </summary>
-        public int Y;
-
-        /// <summary>
-        /// The width of this <see cref="Rectangle"/>.
-        /// </summary>
-        public int Width;
-
-        /// <summary>
-        /// The height of this <see cref="Rectangle"/>.
-        /// </summary>
-        public int Height;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Rectangle"/> struct.
         /// </summary>
-        /// <param name="x">
-        /// The horizontal position of the rectangle. 
-        /// </param>
-        /// <param name="y">
-        /// The vertical position of the rectangle. 
-        /// </param>
-        /// <param name="width">
-        /// The width of the rectangle. 
-        /// </param>
-        /// <param name="height">
-        /// The height of the rectangle. 
-        /// </param>
+        /// <param name="x">The horizontal position of the rectangle.</param>
+        /// <param name="y">The vertical position of the rectangle.</param>
+        /// <param name="width">The width of the rectangle.</param>
+        /// <param name="height">The height of the rectangle.</param>
         public Rectangle(int x, int y, int width, int height)
         {
             this.X = x;
@@ -84,61 +55,56 @@ namespace ImageProcessor
             this.Height = size.Height;
         }
 
+        /// <summary>
+        /// Represents a <see cref="Rectangle"/> that has X, Y, Width, and Height values set to zero.
+        /// </summary>
+        public static readonly Rectangle Empty = new Rectangle();
+
+        /// <summary>
+        /// The x-coordinate of this <see cref="Rectangle"/>.
+        /// </summary>
+        public int X { get; set; }
+
+        /// <summary>
+        /// The y-coordinate of this <see cref="Rectangle"/>.
+        /// </summary>
+        public int Y { get; set; }
+
+        /// <summary>
+        /// The width of this <see cref="Rectangle"/>.
+        /// </summary>
+        public int Width { get; set; }
+
+        /// <summary>
+        /// The height of this <see cref="Rectangle"/>.
+        /// </summary>
+        public int Height { get; set; }
+
         /// <summary>
         /// Gets a value indicating whether this <see cref="Rectangle"/> is empty.
         /// </summary>
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty
-        {
-            get
-            {
-                return this.X == 0 && this.Y == 0 && this.Width == 0 && this.Height == 0;
-            }
-        }
+        public bool IsEmpty => this.X == 0 && this.Y == 0 && this.Width == 0 && this.Height == 0;
 
         /// <summary>
         /// Gets the y-coordinate of the top edge of this <see cref="Rectangle"/>.
         /// </summary>
-        public int Top
-        {
-            get
-            {
-                return this.Y;
-            }
-        }
+        public int Top => this.Y;
 
         /// <summary>
         /// Gets the x-coordinate of the right edge of this <see cref="Rectangle"/>.
         /// </summary>
-        public int Right
-        {
-            get
-            {
-                return this.X + this.Width;
-            }
-        }
+        public int Right => this.X + this.Width;
 
         /// <summary>
         /// Gets the y-coordinate of the bottom edge of this <see cref="Rectangle"/>.
         /// </summary>
-        public int Bottom
-        {
-            get
-            {
-                return this.Y + this.Height;
-            }
-        }
+        public int Bottom => this.Y + this.Height;
 
         /// <summary>
         /// Gets the x-coordinate of the left edge of this <see cref="Rectangle"/>.
         /// </summary>
-        public int Left
-        {
-            get
-            {
-                return this.X;
-            }
-        }
+        public int Left => this.X;
 
         /// <summary>
         /// Compares two <see cref="Rectangle"/> objects. The result specifies whether the values
@@ -219,10 +185,14 @@ namespace ImageProcessor
         /// </returns>
         public override string ToString()
         {
-            return "{X=" + this.X.ToString(CultureInfo.CurrentCulture)
-                   + ",Y=" + this.Y.ToString(CultureInfo.CurrentCulture)
-                   + ",Width=" + this.Width.ToString(CultureInfo.CurrentCulture)
-                   + ",Height=" + this.Height.ToString(CultureInfo.CurrentCulture) + "}";
+            if (this.IsEmpty)
+            {
+                return "Rectangle [ Empty ]";
+            }
+
+            return
+                $"Rectangle [ X={this.X.ToString(CultureInfo.CurrentCulture)}, Y={this.Y.ToString(CultureInfo.CurrentCulture)}, "
+                + $"Width={this.Width.ToString(CultureInfo.CurrentCulture)}, Height={this.Height.ToString(CultureInfo.CurrentCulture)}]";
         }
 
         /// <summary>

src/ImageProcessor/Numerics/Size.cs

@@ -17,23 +17,12 @@ namespace ImageProcessor
     /// <summary>
     /// Stores an ordered pair of integers, which specify a height and width.
     /// </summary>
+    /// <remarks>
+    /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance, 
+    /// as it avoids the need to create new values for modification operations.
+    /// </remarks>
     public struct Size : IEquatable<Size>
     {
-        /// <summary>
-        /// Represents a <see cref="Size"/> that has Width and Height values set to zero.
-        /// </summary>
-        public static readonly Size Empty = new Size();
-
-        /// <summary>
-        /// The width of this <see cref="Size"/>.
-        /// </summary>
-        public int Width;
-
-        /// <summary>
-        /// The height of this <see cref="Size"/>.
-        /// </summary>
-        public int Height;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Size"/> struct.
         /// </summary>
@@ -49,17 +38,26 @@ namespace ImageProcessor
             this.Height = height;
         }
 
+        /// <summary>
+        /// Represents a <see cref="Size"/> that has Width and Height values set to zero.
+        /// </summary>
+        public static readonly Size Empty = new Size();
+
+        /// <summary>
+        /// The width of this <see cref="Size"/>.
+        /// </summary>
+        public int Width { get; set; }
+
+        /// <summary>
+        /// The height of this <see cref="Size"/>.
+        /// </summary>
+        public int Height { get; set; }
+
         /// <summary>
         /// Gets a value indicating whether this <see cref="Size"/> is empty.
         /// </summary>
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty
-        {
-            get
-            {
-                return this.Width == 0 && this.Height == 0;
-            }
-        }
+        public bool IsEmpty => this.Width == 0 && this.Height == 0;
 
         /// <summary>
         /// Compares two <see cref="Size"/> objects. The result specifies whether the values
@@ -137,8 +135,13 @@ namespace ImageProcessor
         /// </returns>
         public override string ToString()
         {
-            return "{Width=" + this.Width.ToString(CultureInfo.CurrentCulture)
-                   + ",Height=" + this.Height.ToString(CultureInfo.CurrentCulture) + "}";
+            if (this.IsEmpty)
+            {
+                return "Size [ Empty ]";
+            }
+
+            return
+                $"Size [ Width={this.Width.ToString(CultureInfo.CurrentCulture)}, Height={this.Height.ToString(CultureInfo.CurrentCulture)} ]";
         }
 
         /// <summary>

tests/ImageProcessor.Tests/Colors/ColorConversionTests.cs

@@ -10,7 +10,6 @@
 
 namespace ImageProcessor.Tests
 {
-    using System.Diagnostics;
     using System.Diagnostics.CodeAnalysis;
 
     using Xunit;