Minor refactoring inside some of the IsSupportedFileFormat methods.

SixLabors · Dec 19, 2016 · fdca608 · fdca608
1 parent a0abb9f
commit fdca608
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 22 deletions.
diff --git a/src/ImageSharp/Formats/Bmp/BmpFormat.cs b/src/ImageSharp/Formats/Bmp/BmpFormat.cs
@@ -33,14 +33,9 @@ public class BmpFormat : IImageFormat
         /// <inheritdoc/>
         public bool IsSupportedFileFormat(byte[] header)
         {
-            bool isBmp = false;
-            if (header.Length >= this.HeaderSize)
-            {
-                isBmp = header[0] == 0x42 && // B
-                        header[1] == 0x4D;   // M
-            }
-
-            return isBmp;
+            return header.Length >= this.HeaderSize &&
+                   header[0] == 0x42 && // B
+                   header[1] == 0x4D;   // M
         }
     }
 }
diff --git a/src/ImageSharp/Formats/Jpg/JpegFormat.cs b/src/ImageSharp/Formats/Jpg/JpegFormat.cs
@@ -33,20 +33,8 @@ public class JpegFormat : IImageFormat
         /// <inheritdoc/>
         public bool IsSupportedFileFormat(byte[] header)
         {
-            Guard.NotNull(header, "header");
-
-            bool isSupported = false;
-
-            if (header.Length >= this.HeaderSize)
-            {
-                bool isJfif = IsJfif(header);
-                bool isExif = IsExif(header);
-                bool isJpeg = IsJpeg(header);
-
-                isSupported = isJfif || isExif || isJpeg;
-            }
-
-            return isSupported;
+            return header.Length >= this.HeaderSize &&
+                   (IsJfif(header) || IsExif(header) || IsJpeg(header));
         }
 
         /// <summary>