From fdca608c89499920bd71f128942668d2c6495861 Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Mon, 19 Dec 2016 14:19:00 +0100 Subject: [PATCH] Minor refactoring inside some of the IsSupportedFileFormat methods. --- src/ImageSharp/Formats/Bmp/BmpFormat.cs | 11 +++-------- src/ImageSharp/Formats/Jpg/JpegFormat.cs | 16 ++-------------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/src/ImageSharp/Formats/Bmp/BmpFormat.cs b/src/ImageSharp/Formats/Bmp/BmpFormat.cs index c0ed5aabac..bf73d31621 100644 --- a/src/ImageSharp/Formats/Bmp/BmpFormat.cs +++ b/src/ImageSharp/Formats/Bmp/BmpFormat.cs @@ -33,14 +33,9 @@ public class BmpFormat : IImageFormat /// 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 index 6712de54b7..b93c6ae690 100644 --- a/src/ImageSharp/Formats/Jpg/JpegFormat.cs +++ b/src/ImageSharp/Formats/Jpg/JpegFormat.cs @@ -33,20 +33,8 @@ public class JpegFormat : IImageFormat /// 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)); } ///