Optimizer png decoder

Former-commit-id: 0d011990d4ac6aa28101c3c60d3db7be65a02d88
Former-commit-id: ad8aa0af7751298478589185f897518be096c37b
Former-commit-id: 163e1c78990260fdd0cc1857a4c5971d6abe7e52

src/ImageProcessor/Common/Extensions/ComparableExtensions.cs

@@ -17,22 +17,6 @@ namespace ImageProcessor
     /// </summary>
     internal static class ComparableExtensions
     {
-        /// <summary>
-        /// Returns value indicating whether the given number is with in the minimum and maximum
-        /// given range.
-        /// </summary>
-        /// <param name="value">The value to to check. </param>
-        /// <param name="min">The minimum range value.</param>
-        /// <param name="max">The maximum range value.</param>
-        /// <typeparam name="T">The <see cref="System.Type"/> to test.</typeparam>
-        /// <returns>
-        /// True if the value falls within the maximum and minimum; otherwise, false.
-        /// </returns>
-        public static bool IsBetween<T>(this T value, T min, T max) where T : IComparable<T>
-        {
-            return (value.CompareTo(min) > 0) && (value.CompareTo(max) < 0);
-        }
-
         /// <summary>
         /// Restricts a value to be within a specified range.
         /// </summary>
@@ -43,7 +27,8 @@ namespace ImageProcessor
         /// <returns>
         /// The <see cref="IComparable{T}"/> representing the clamped value.
         /// </returns>
-        public static T Clamp<T>(this T value, T min, T max) where T : IComparable<T>
+        public static T Clamp<T>(this T value, T min, T max)
+                    where T : IComparable<T>
         {
             if (value.CompareTo(min) < 0)
             {

src/ImageProcessor/Formats/Png/PngDecoderCore.cs

@@ -449,7 +449,7 @@ namespace ImageProcessor.Formats
             byte[] crcBuffer = new byte[4];
 
             int numBytes = this.currentStream.Read(crcBuffer, 0, 4);
-            if (numBytes.IsBetween(1, 3))
+            if (numBytes >= 1 && numBytes <= 3)
             {
                 throw new ImageFormatException("Image stream is not valid!");
             }
@@ -501,7 +501,7 @@ namespace ImageProcessor.Formats
             byte[] typeBuffer = new byte[4];
 
             int numBytes = this.currentStream.Read(typeBuffer, 0, 4);
-            if (numBytes.IsBetween(1, 3))
+            if (numBytes >= 1 && numBytes <= 3)
             {
                 throw new ImageFormatException("Image stream is not valid!");
             }
@@ -532,7 +532,7 @@ namespace ImageProcessor.Formats
             byte[] lengthBuffer = new byte[4];
 
             int numBytes = this.currentStream.Read(lengthBuffer, 0, 4);
-            if (numBytes.IsBetween(1, 3))
+            if (numBytes >= 1 && numBytes <= 3)
             {
                 throw new ImageFormatException("Image stream is not valid!");
             }