Merge remote-tracking branch 'refs/remotes/origin/master' into feature/interlaced

README.md

@@ -5,8 +5,13 @@
 
 > **ImageSharp is still in early stages (alpha) but progress has been pretty quick. As such, please do not use on production environments until the library reaches release candidate status. Pre-release downloads are available from the [MyGet package repository](https://www.myget.org/gallery/imagesharp).**
 
+[![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://raw.githubusercontent.com/JimBobSquarePants/ImageSharp/master/APACHE-2.0-LICENSE.txt)
 [![Build status](https://ci.appveyor.com/api/projects/status/hu6d1gdpxdw0q360/branch/master?svg=true)](https://ci.appveyor.com/project/JamesSouth/imagesharp/branch/master)
+[![GitHub issues](https://img.shields.io/github/issues/JimBobSquarePants/ImageSharp.svg)](https://github.com/JimBobSquarePants/ImageSharp/issues)
+[![GitHub stars](https://img.shields.io/github/stars/JimBobSquarePants/ImageSharp.svg)](https://github.com/JimBobSquarePants/ImageSharp/stargazers)
+[![GitHub forks](https://img.shields.io/github/forks/JimBobSquarePants/ImageSharp.svg)](https://github.com/JimBobSquarePants/ImageSharp/network)
 [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/ImageSharp/General?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Twitter](https://img.shields.io/twitter/url/https/github.com/JimBobSquarePants/ImageSharp.svg?style=social)](https://twitter.com/intent/tweet?hashtags=imagesharp,dotnet,oss&text=ImageSharp.+A+new+cross-platform+2D+graphics+API+in+C%23&url=https%3a%2f%2fgithub.com%2fJimBobSquarePants%2fImageSharp&via=james_m_south)
 
 ### Installation
 At present the code is pre-release but when ready it will be available on [Nuget](http://www.nuget.org). 
@@ -211,4 +216,4 @@ Grand High Eternal Dictator
 
 Core Team
 - [Dirk Lemstra](https://github.com/dlemstra)
-- [Jeavon Leopold](https://github.com/jeavon)
+- [Jeavon Leopold](https://github.com/jeavon)

src/ImageSharp/Image/PixelAccessor.cs

@@ -6,6 +6,7 @@
 namespace ImageSharp
 {
     using System;
+    using System.Diagnostics;
     using System.Runtime.CompilerServices;
     using System.Runtime.InteropServices;
 
@@ -106,38 +107,33 @@ namespace ImageSharp
         {
             get
             {
-#if DEBUG
+                this.CheckCoordinates(x, y);
-                if (x < 0 || x >= this.Width)
+
-                {
-                    throw new ArgumentOutOfRangeException(nameof(x), x, $"{x} is outwith the image bounds.");
-                }
-
-                if (y < 0 || y >= this.Height)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(y), y, $"{y} is outwith the image bounds.");
-                }
-#endif
                 return Unsafe.Read<TColor>(this.pixelsBase + (((y * this.Width) + x) * Unsafe.SizeOf<TColor>()));
             }
 
             set
             {
-#if DEBUG
+                this.CheckCoordinates(x, y);
-                if (x < 0 || x >= this.Width)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(x), x, $"{x} is outwith the image bounds.");
-                }
-
-                if (y < 0 || y >= this.Height)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(y), y, $"{y} is outwith the image bounds.");
-                }
-#endif
 
                 Unsafe.Write(this.pixelsBase + (((y * this.Width) + x) * Unsafe.SizeOf<TColor>()), value);
             }
         }
 
+        [Conditional("DEBUG")]
+        private void CheckCoordinates(int x, int y)
+        {
+            if (x < 0 || x >= this.Width)
+            {
+                throw new ArgumentOutOfRangeException(nameof(x), x, $"{x} is outwith the image bounds.");
+            }
+
+            if (y < 0 || y >= this.Height)
+            {
+                throw new ArgumentOutOfRangeException(nameof(y), y, $"{y} is outwith the image bounds.");
+            }
+        }
+
         /// <summary>
         /// Copies a block of pixels at the specified position.
         /// </summary>