From dd571d936962cddc08c1a620fbcb42531fc61999 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 13 Dec 2019 23:01:32 +1100
Subject: [PATCH] Revert non-generic decode to use RGba32 and add comments

---
 src/ImageSharp/Formats/IImageDecoder.cs       |  7 ++---
 src/ImageSharp/Formats/Jpeg/JpegDecoder.cs    |  9 +-----
 .../Formats/Jpeg/JpegDecoderCore.cs           | 16 ----------
 src/ImageSharp/Image.FromBytes.cs             | 30 +++++++++----------
 src/ImageSharp/Image.FromFile.cs              | 22 +++++++-------
 src/ImageSharp/Image.FromStream.cs            |  6 ++--
 6 files changed, 33 insertions(+), 57 deletions(-)

diff --git a/src/ImageSharp/Formats/IImageDecoder.cs b/src/ImageSharp/Formats/IImageDecoder.cs
index 8dafdac79..b69ed8453 100644
--- a/src/ImageSharp/Formats/IImageDecoder.cs
+++ b/src/ImageSharp/Formats/IImageDecoder.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 using System.IO;
@@ -17,17 +17,16 @@ namespace SixLabors.ImageSharp.Formats
         /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="configuration">The configuration for the image.</param>
         /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
-        /// <returns>The decoded image of a given pixel type.</returns>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         Image<TPixel> Decode<TPixel>(Configuration configuration, Stream stream)
             where TPixel : struct, IPixel<TPixel>;
 
         /// <summary>
         /// Decodes the image from the specified stream to an <see cref="Image"/>.
-        /// The decoder is free to choose the pixel type.
         /// </summary>
         /// <param name="configuration">The configuration for the image.</param>
         /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
-        /// <returns>The decoded image of a pixel type chosen by the decoder.</returns>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         Image Decode(Configuration configuration, Stream stream);
     }
 }
diff --git a/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs b/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs
index 63276babd..4e1c0c1be 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs
@@ -30,14 +30,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
 
         /// <inheritdoc />
         public Image Decode(Configuration configuration, Stream stream)
-        {
-            Guard.NotNull(stream, nameof(stream));
-
-            using (var decoder = new JpegDecoderCore(configuration, this))
-            {
-                return decoder.Decode(stream);
-            }
-        }
+            => this.Decode<Rgba32>(configuration, stream);
 
         /// <inheritdoc/>
         public IImageInfo Identify(Configuration configuration, Stream stream)
diff --git a/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
index 193983cd0..60709ed00 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
@@ -204,22 +204,6 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
             return new JpegFileMarker(marker[1], stream.Position - 2, true);
         }
 
-        /// <summary>
-        /// Decodes the image from the specified <see cref="Stream"/>  and sets the data to image.
-        /// </summary>
-        /// <param name="stream">The stream, where the image should be.</param>
-        /// <returns>The decoded image.</returns>
-        public Image Decode(Stream stream)
-        {
-            this.ParseStream(stream);
-            this.InitExifProfile();
-            this.InitIccProfile();
-            this.InitDerivedMetadataProperties();
-            return this.ColorSpace == JpegColorSpace.Grayscale
-                ? (Image)this.PostProcessIntoImage<L8>()
-                : this.PostProcessIntoImage<Rgb24>();
-        }
-
         /// <summary>
         /// Decodes the image from the specified <see cref="Stream"/>  and sets the data to image.
         /// </summary>
diff --git a/src/ImageSharp/Image.FromBytes.cs b/src/ImageSharp/Image.FromBytes.cs
index 465139b2e..294a86b35 100644
--- a/src/ImageSharp/Image.FromBytes.cs
+++ b/src/ImageSharp/Image.FromBytes.cs
@@ -270,7 +270,7 @@ namespace SixLabors.ImageSharp
         /// </summary>
         /// <param name="data">The byte array containing image data.</param>
         /// <param name="format">The detected format.</param>
-        /// <returns>A new <see cref="Image"/>.</returns>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         public static Image Load(byte[] data, out IImageFormat format) =>
             Load(Configuration.Default, data, out format);
 
@@ -279,24 +279,24 @@ namespace SixLabors.ImageSharp
         /// </summary>
         /// <param name="data">The byte array containing encoded image data.</param>
         /// <param name="decoder">The decoder.</param>
-        /// <returns>A new <see cref="Image"/>.</returns>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         public static Image Load(byte[] data, IImageDecoder decoder) => Load(Configuration.Default, data, decoder);
 
         /// <summary>
-        /// Load a new instance of <see cref="Image{Rgba32}"/> from the given encoded byte array.
+        /// Load a new instance of <see cref="Image"/> from the given encoded byte array.
         /// </summary>
         /// <param name="config">The config for the decoder.</param>
         /// <param name="data">The byte array containing encoded image data.</param>
-        /// <returns>A new <see cref="Image{Rgba32}"/>.</returns>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         public static Image Load(Configuration config, byte[] data) => Load(config, data, out _);
 
         /// <summary>
-        /// Load a new instance of <see cref="Image{Rgba32}"/> from the given encoded byte array.
+        /// Load a new instance of <see cref="Image"/> from the given encoded byte array.
         /// </summary>
         /// <param name="config">The config for the decoder.</param>
         /// <param name="data">The byte array containing image data.</param>
         /// <param name="decoder">The decoder.</param>
-        /// <returns>A new <see cref="Image{Rgba32}"/>.</returns>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         public static Image Load(Configuration config, byte[] data, IImageDecoder decoder)
         {
             using (var stream = new MemoryStream(data))
@@ -306,12 +306,12 @@ namespace SixLabors.ImageSharp
         }
 
         /// <summary>
-        /// Load a new instance of <see cref="Image{Rgba32}"/> from the given encoded byte array.
+        /// Load a new instance of <see cref="Image"/> from the given encoded byte array.
         /// </summary>
         /// <param name="config">The config for the decoder.</param>
         /// <param name="data">The byte array containing image data.</param>
         /// <param name="format">The mime type of the decoded image.</param>
-        /// <returns>A new <see cref="Image{Rgba32}"/>.</returns>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         public static Image Load(Configuration config, byte[] data, out IImageFormat format)
         {
             using (var stream = new MemoryStream(data))
@@ -321,10 +321,10 @@ namespace SixLabors.ImageSharp
         }
 
         /// <summary>
-        /// Load a new instance of <see cref="Image{Rgba32}"/> from the given encoded byte span.
+        /// Load a new instance of <see cref="Image"/> from the given encoded byte span.
         /// </summary>
         /// <param name="data">The byte span containing image data.</param>
-        /// <returns>A new <see cref="Image{Rgba32}"/>.</returns>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         public static Image Load(ReadOnlySpan<byte> data) => Load(Configuration.Default, data);
 
         /// <summary>
@@ -332,7 +332,7 @@ namespace SixLabors.ImageSharp
         /// </summary>
         /// <param name="data">The byte span containing image data.</param>
         /// <param name="decoder">The decoder.</param>
-        /// <returns>A new <see cref="Image"/>.</returns>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         public static Image Load(ReadOnlySpan<byte> data, IImageDecoder decoder) =>
             Load(Configuration.Default, data, decoder);
 
@@ -341,7 +341,7 @@ namespace SixLabors.ImageSharp
         /// </summary>
         /// <param name="data">The byte span containing image data.</param>
         /// <param name="format">The detected format.</param>
-        /// <returns>A new <see cref="Image"/>.</returns>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         public static Image Load(ReadOnlySpan<byte> data, out IImageFormat format) =>
             Load(Configuration.Default, data, out format);
 
@@ -350,7 +350,7 @@ namespace SixLabors.ImageSharp
         /// </summary>
         /// <param name="config">The configuration options.</param>
         /// <param name="data">The byte span containing image data.</param>
-        /// <returns>A new <see cref="Image"/>.</returns>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         public static Image Load(Configuration config, ReadOnlySpan<byte> data) => Load(config, data, out _);
 
         /// <summary>
@@ -359,7 +359,7 @@ namespace SixLabors.ImageSharp
         /// <param name="config">The Configuration.</param>
         /// <param name="data">The byte span containing image data.</param>
         /// <param name="decoder">The decoder.</param>
-        /// <returns>A new <see cref="Image"/>.</returns>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         public static unsafe Image Load(
             Configuration config,
             ReadOnlySpan<byte> data,
@@ -380,7 +380,7 @@ namespace SixLabors.ImageSharp
         /// <param name="config">The configuration options.</param>
         /// <param name="data">The byte span containing image data.</param>
         /// <param name="format">The <see cref="IImageFormat"/> of the decoded image.</param>>
-        /// <returns>A new <see cref="Image"/>.</returns>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         public static unsafe Image Load(
             Configuration config,
             ReadOnlySpan<byte> data,
diff --git a/src/ImageSharp/Image.FromFile.cs b/src/ImageSharp/Image.FromFile.cs
index 08ed381c5..4423d800a 100644
--- a/src/ImageSharp/Image.FromFile.cs
+++ b/src/ImageSharp/Image.FromFile.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;
@@ -39,17 +39,17 @@ namespace SixLabors.ImageSharp
         }
 
         /// <summary>
-        /// Create a new instance of the <see cref="Image{Rgba32}"/> class from the given file.
+        /// Create a new instance of the <see cref="Image"/> class from the given file.
         /// </summary>
         /// <param name="path">The file path to the image.</param>
         /// <exception cref="NotSupportedException">
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
-        /// <returns>A new <see cref="Image{Rgba32}"/>.</returns>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         public static Image Load(string path) => Load(Configuration.Default, path);
 
         /// <summary>
-        /// Create a new instance of the <see cref="Image{Rgba32}"/> class from the given file.
+        /// Create a new instance of the <see cref="Image"/> class from the given file.
         /// </summary>
         /// <param name="path">The file path to the image.</param>
         /// <param name="format">The mime type of the decoded image.</param>
@@ -60,18 +60,18 @@ namespace SixLabors.ImageSharp
         public static Image Load(string path, out IImageFormat format) => Load(Configuration.Default, path, out format);
 
         /// <summary>
-        /// Create a new instance of the <see cref="Image{Rgba32}"/> class from the given file.
+        /// Create a new instance of the <see cref="Image"/> class from the given file.
         /// </summary>
         /// <param name="config">The config for the decoder.</param>
         /// <param name="path">The file path to the image.</param>
         /// <exception cref="NotSupportedException">
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
-        /// <returns>A new <see cref="Image{Rgba32}"/>.</returns>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         public static Image Load(Configuration config, string path) => Load(config, path, out _);
 
         /// <summary>
-        /// Create a new instance of the <see cref="Image{Rgba32}"/> class from the given file.
+        /// Create a new instance of the <see cref="Image"/> class from the given file.
         /// </summary>
         /// <param name="config">The Configuration.</param>
         /// <param name="path">The file path to the image.</param>
@@ -79,7 +79,7 @@ namespace SixLabors.ImageSharp
         /// <exception cref="NotSupportedException">
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
-        /// <returns>A new <see cref="Image{Rgba32}"/>.</returns>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         public static Image Load(Configuration config, string path, IImageDecoder decoder)
         {
             using (Stream stream = config.FileSystem.OpenRead(path))
@@ -89,14 +89,14 @@ namespace SixLabors.ImageSharp
         }
 
         /// <summary>
-        /// Create a new instance of the <see cref="Image{Rgba32}"/> class from the given file.
+        /// Create a new instance of the <see cref="Image"/> class from the given file.
         /// </summary>
         /// <param name="path">The file path to the image.</param>
         /// <param name="decoder">The decoder.</param>
         /// <exception cref="NotSupportedException">
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
-        /// <returns>A new <see cref="Image{Rgba32}"/>.</returns>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         public static Image Load(string path, IImageDecoder decoder) => Load(Configuration.Default, path, decoder);
 
         /// <summary>
@@ -224,4 +224,4 @@ namespace SixLabors.ImageSharp
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ImageSharp/Image.FromStream.cs b/src/ImageSharp/Image.FromStream.cs
index 60db45f21..c88072546 100644
--- a/src/ImageSharp/Image.FromStream.cs
+++ b/src/ImageSharp/Image.FromStream.cs
@@ -80,7 +80,7 @@ namespace SixLabors.ImageSharp
         /// <param name="format">The format type of the decoded image.</param>
         /// <exception cref="NotSupportedException">Thrown if the stream is not readable.</exception>
         /// <exception cref="UnknownImageFormatException">Image cannot be loaded.</exception>
-        /// <returns>A new <see cref="Image"/>.</returns>>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         public static Image Load(Stream stream, out IImageFormat format) => Load(Configuration.Default, stream, out format);
 
         /// <summary>
@@ -90,7 +90,7 @@ namespace SixLabors.ImageSharp
         /// <param name="stream">The stream containing image information.</param>
         /// <exception cref="NotSupportedException">Thrown if the stream is not readable.</exception>
         /// <exception cref="UnknownImageFormatException">Image cannot be loaded.</exception>
-        /// <returns>A new <see cref="Image"/>.</returns>>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         public static Image Load(Stream stream) => Load(Configuration.Default, stream);
 
         /// <summary>
@@ -101,7 +101,7 @@ namespace SixLabors.ImageSharp
         /// <param name="decoder">The decoder.</param>
         /// <exception cref="NotSupportedException">Thrown if the stream is not readable.</exception>
         /// <exception cref="UnknownImageFormatException">Image cannot be loaded.</exception>
-        /// <returns>A new <see cref="Image"/>.</returns>>
+        /// <returns>The <see cref="Image"/> in <see cref="Rgba32"/> pixel format.</returns>
         public static Image Load(Stream stream, IImageDecoder decoder) => Load(Configuration.Default, stream, decoder);
 
         /// <summary>