Merge pull request #671 from SixLabors/js/remove-allocaton

Use span directly for DetectFormat
SixLabors · Aug 8, 2018 · dcdb9db · dcdb9db
2 parents afa2a1b + 37503b3
commit dcdb9db
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/ImageSharp/Image.FromBytes.cs b/src/ImageSharp/Image.FromBytes.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Linq;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.PixelFormats;
 
@@ -193,13 +194,24 @@ public static IImageFormat DetectFormat(ReadOnlySpan<byte> data)
         /// <returns>The mime type or null if none found.</returns>
         public static unsafe IImageFormat DetectFormat(Configuration config, ReadOnlySpan<byte> data)
         {
-            fixed (byte* ptr = &data.GetPinnableReference())
+            int maxHeaderSize = config.MaxHeaderSize;
+            if (maxHeaderSize <= 0)
             {
-                using (var stream = new UnmanagedMemoryStream(ptr, data.Length))
+                return null;
+            }
+
+            IImageFormat format = default;
+            foreach (IImageFormatDetector detector in config.ImageFormatsManager.FormatDetectors)
+            {
+                IImageFormat f = detector.DetectFormat(data);
+
+                if (f != null)
                 {
-                    return DetectFormat(config, stream);
+                    format = f;
                 }
             }
+
+            return format;
         }
 
         /// <summary>