From 61c30de89e277a321d0a8a2dd189256cd1503a5d Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Tue, 30 Nov 2021 11:56:56 +1100
Subject: [PATCH] Stub out approach

---
 src/ImageSharp/Formats/Png/PngDecoder.cs     | 17 +++++++-
 src/ImageSharp/Formats/Png/PngDecoderCore.cs | 42 +++++++++++---------
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/src/ImageSharp/Formats/Png/PngDecoder.cs b/src/ImageSharp/Formats/Png/PngDecoder.cs
index 479c24b7e8..ea898b0506 100644
--- a/src/ImageSharp/Formats/Png/PngDecoder.cs
+++ b/src/ImageSharp/Formats/Png/PngDecoder.cs
@@ -20,12 +20,25 @@ namespace SixLabors.ImageSharp.Formats.Png
         public Image<TPixel> Decode<TPixel>(Configuration configuration, Stream stream)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            var decoder = new PngDecoderCore(configuration, this);
+            PngDecoderCore decoder = new(configuration, this);
             return decoder.Decode<TPixel>(configuration, stream);
         }
 
         /// <inheritdoc />
-        public Image Decode(Configuration configuration, Stream stream) => this.Decode<Rgba32>(configuration, stream);
+        public Image Decode(Configuration configuration, Stream stream)
+        {
+            PngDecoderCore decoder = new(configuration, true);
+            IImageInfo info = decoder.Identify(configuration, stream);
+            stream.Position = 0;
+
+            switch (info.Metadata.GetPngMetadata().ColorType)
+            {
+                default:
+                    break;
+            }
+
+            return this.Decode<Rgba32>(configuration, stream);
+        }
 
         /// <inheritdoc/>
         public Task<Image<TPixel>> DecodeAsync<TPixel>(Configuration configuration, Stream stream, CancellationToken cancellationToken)
diff --git a/src/ImageSharp/Formats/Png/PngDecoderCore.cs b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
index cf3cd7eb14..e741db72c6 100644
--- a/src/ImageSharp/Formats/Png/PngDecoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
@@ -124,6 +124,13 @@ namespace SixLabors.ImageSharp.Formats.Png
             this.ignoreMetadata = options.IgnoreMetadata;
         }
 
+        internal PngDecoderCore(Configuration configuration, bool ignoreMetadata)
+        {
+            this.Configuration = configuration ?? Configuration.Default;
+            this.memoryAllocator = this.Configuration.MemoryAllocator;
+            this.ignoreMetadata = ignoreMetadata;
+        }
+
         /// <inheritdoc/>
         public Configuration Configuration { get; }
 
@@ -168,12 +175,12 @@ namespace SixLabors.ImageSharp.Formats.Png
 
                                 break;
                             case PngChunkType.Palette:
-                                var pal = new byte[chunk.Length];
+                                byte[] pal = new byte[chunk.Length];
                                 chunk.Data.GetSpan().CopyTo(pal);
                                 this.palette = pal;
                                 break;
                             case PngChunkType.Transparency:
-                                var alpha = new byte[chunk.Length];
+                                byte[] alpha = new byte[chunk.Length];
                                 chunk.Data.GetSpan().CopyTo(alpha);
                                 this.paletteAlpha = alpha;
                                 this.AssignTransparentMarkers(alpha, pngMetadata);
@@ -190,7 +197,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                             case PngChunkType.Exif:
                                 if (!this.ignoreMetadata)
                                 {
-                                    var exifData = new byte[chunk.Length];
+                                    byte[] exifData = new byte[chunk.Length];
                                     chunk.Data.GetSpan().CopyTo(exifData);
                                     metadata.ExifProfile = new ExifProfile(exifData);
                                 }
@@ -263,7 +270,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                             case PngChunkType.Exif:
                                 if (!this.ignoreMetadata)
                                 {
-                                    var exifData = new byte[chunk.Length];
+                                    byte[] exifData = new byte[chunk.Length];
                                     chunk.Data.GetSpan().CopyTo(exifData);
                                     metadata.ExifProfile = new ExifProfile(exifData);
                                 }
@@ -364,11 +371,10 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// <param name="pngMetadata">The metadata to read to.</param>
         /// <param name="data">The data containing physical data.</param>
         private void ReadGammaChunk(PngMetadata pngMetadata, ReadOnlySpan<byte> data)
-        {
+
             // The value is encoded as a 4-byte unsigned integer, representing gamma times 100000.
             // For example, a gamma of 1/2.2 would be stored as 45455.
-            pngMetadata.Gamma = BinaryPrimitives.ReadUInt32BigEndian(data) / 100_000F;
-        }
+            => pngMetadata.Gamma = BinaryPrimitives.ReadUInt32BigEndian(data) / 100_000F;
 
         /// <summary>
         /// Initializes the image and various buffers needed for processing
@@ -477,19 +483,17 @@ namespace SixLabors.ImageSharp.Formats.Png
         private void ReadScanlines<TPixel>(PngChunk chunk, ImageFrame<TPixel> image, PngMetadata pngMetadata)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            using (var deframeStream = new ZlibInflateStream(this.currentStream, this.ReadNextDataChunk))
-            {
-                deframeStream.AllocateNewBytes(chunk.Length, true);
-                DeflateStream dataStream = deframeStream.CompressedStream;
+            using var deframeStream = new ZlibInflateStream(this.currentStream, this.ReadNextDataChunk);
+            deframeStream.AllocateNewBytes(chunk.Length, true);
+            DeflateStream dataStream = deframeStream.CompressedStream;
 
-                if (this.header.InterlaceMethod == PngInterlaceMode.Adam7)
-                {
-                    this.DecodeInterlacedPixelData(dataStream, image, pngMetadata);
-                }
-                else
-                {
-                    this.DecodePixelData(dataStream, image, pngMetadata);
-                }
+            if (this.header.InterlaceMethod == PngInterlaceMode.Adam7)
+            {
+                this.DecodeInterlacedPixelData(dataStream, image, pngMetadata);
+            }
+            else
+            {
+                this.DecodePixelData(dataStream, image, pngMetadata);
             }
         }