Fix simple issues in review

Author: Poker-sang

src/ImageSharp/Configuration.cs

@@ -43,7 +43,7 @@ public Configuration()
     /// Initializes a new instance of the <see cref="Configuration" /> class.
     /// </summary>
     /// <param name="configurationModules">A collection of configuration modules to register.</param>
-    public Configuration(params IImageFormatConfigurationModule[]? configurationModules)
+    public Configuration(params IImageFormatConfigurationModule[] configurationModules)
     {
         if (configurationModules != null)
         {

…rmats/Png/Chunks/APngAnimationControl.cs …p/Formats/Png/Chunks/AnimationControl.cssrc/ImageSharp/Formats/Png/Chunks/APngAnimationControl.cs renamed to src/ImageSharp/Formats/Png/Chunks/AnimationControl.cs src/ImageSharp/Formats/Png/Chunks/APngAnimationControl.cs renamed to src/ImageSharp/Formats/Png/Chunks/AnimationControl.cs

@@ -5,7 +5,7 @@
 
 namespace SixLabors.ImageSharp.Formats.Png.Chunks;
 
-internal record APngAnimationControl(
+internal record AnimationControl(
     int NumberFrames,
     int NumberPlays)
 {
@@ -36,7 +36,7 @@ public void WriteTo(Span<byte> buffer)
     /// </summary>
     /// <param name="data">The data to parse.</param>
     /// <returns>The parsed acTL.</returns>
-    public static APngAnimationControl Parse(ReadOnlySpan<byte> data)
+    public static AnimationControl Parse(ReadOnlySpan<byte> data)
         => new(
             NumberFrames: BinaryPrimitives.ReadInt32BigEndian(data[..4]),
             NumberPlays: BinaryPrimitives.ReadInt32BigEndian(data[4..8]));

…p/Formats/Png/Chunks/APngFrameControl.cs …Sharp/Formats/Png/Chunks/FrameControl.cssrc/ImageSharp/Formats/Png/Chunks/APngFrameControl.cs renamed to src/ImageSharp/Formats/Png/Chunks/FrameControl.cs src/ImageSharp/Formats/Png/Chunks/APngFrameControl.cs renamed to src/ImageSharp/Formats/Png/Chunks/FrameControl.cs

@@ -5,20 +5,20 @@
 
 namespace SixLabors.ImageSharp.Formats.Png.Chunks;
 
-internal readonly struct APngFrameControl
+internal readonly struct FrameControl
 {
     public const int Size = 26;
 
-    public APngFrameControl(
+    public FrameControl(
         int sequenceNumber,
         int width,
         int height,
         int xOffset,
         int yOffset,
         short delayNumber,
         short delayDenominator,
-        APngDisposeOperation disposeOperation,
-        APngBlendOperation blendOperation)
+        PngDisposeOperation disposeOperation,
+        PngBlendOperation blendOperation)
     {
         this.SequenceNumber = sequenceNumber;
         this.Width = width;
@@ -69,12 +69,12 @@ public APngFrameControl(
     /// <summary>
     /// Gets the type of frame area disposal to be done after rendering this frame
     /// </summary>
-    public APngDisposeOperation DisposeOperation { get; }
+    public PngDisposeOperation DisposeOperation { get; }
 
     /// <summary>
     /// Gets the type of frame area rendering for this frame
     /// </summary>
-    public APngBlendOperation BlendOperation { get; }
+    public PngBlendOperation BlendOperation { get; }
 
     /// <summary>
     /// Validates the APng fcTL.
@@ -120,9 +120,9 @@ public void Validate(PngHeader hdr)
     /// </summary>
     /// <param name="frameMetadata">The metadata to parse.</param>
     /// <param name="sequenceNumber">Sequence number.</param>
-    public static APngFrameControl FromMetadata(APngFrameMetadata frameMetadata, int sequenceNumber)
+    public static FrameControl FromMetadata(PngFrameMetadata frameMetadata, int sequenceNumber)
     {
-        APngFrameControl fcTL = new(
+        FrameControl fcTL = new(
             sequenceNumber,
             frameMetadata.Width,
             frameMetadata.Height,
@@ -158,7 +158,7 @@ public void WriteTo(Span<byte> buffer)
     /// </summary>
     /// <param name="data">The data to parse.</param>
     /// <returns>The parsed fcTL.</returns>
-    public static APngFrameControl Parse(ReadOnlySpan<byte> data)
+    public static FrameControl Parse(ReadOnlySpan<byte> data)
         => new(
             sequenceNumber: BinaryPrimitives.ReadInt32BigEndian(data[..4]),
             width: BinaryPrimitives.ReadInt32BigEndian(data[4..8]),
@@ -167,6 +167,6 @@ public static APngFrameControl Parse(ReadOnlySpan<byte> data)
             yOffset: BinaryPrimitives.ReadInt32BigEndian(data[16..20]),
             delayNumber: BinaryPrimitives.ReadInt16BigEndian(data[20..22]),
             delayDenominator: BinaryPrimitives.ReadInt16BigEndian(data[22..24]),
-            disposeOperation: (APngDisposeOperation)data[24],
-            blendOperation: (APngBlendOperation)data[25]);
+            disposeOperation: (PngDisposeOperation)data[24],
+            blendOperation: (PngBlendOperation)data[25]);
 }

src/ImageSharp/Formats/Png/MetadataExtensions.cs

@@ -23,15 +23,14 @@ public static partial class MetadataExtensions
     /// Gets the aPng format specific metadata for the image frame.
     /// </summary>
     /// <param name="source">The metadata this method extends.</param>
-    /// <returns>The <see cref="APngFrameMetadata"/>.</returns>
-    public static APngFrameMetadata GetAPngFrameMetadata(this ImageFrameMetadata source) => source.GetFormatMetadata(PngFormat.Instance);
+    /// <returns>The <see cref="PngFrameMetadata"/>.</returns>
+    public static PngFrameMetadata GetPngFrameMetadata(this ImageFrameMetadata source) => source.GetFormatMetadata(PngFormat.Instance);
 
     /// <summary>
     /// Gets the aPng format specific metadata for the image frame.
     /// </summary>
     /// <param name="source">The metadata this method extends.</param>
     /// <param name="metadata">The metadata.</param>
-    /// <returns>The <see cref="APngFrameMetadata"/>.</returns>
-    public static bool TryGetAPngFrameMetadata(this ImageFrameMetadata source, [NotNullWhen(true)] out APngFrameMetadata? metadata) => source.TryGetFormatMetadata(PngFormat.Instance, out metadata);
-
+    /// <returns>The <see cref="PngFrameMetadata"/>.</returns>
+    public static bool TryGetPngFrameMetadata(this ImageFrameMetadata source, [NotNullWhen(true)] out PngFrameMetadata? metadata) => source.TryGetFormatMetadata(PngFormat.Instance, out metadata);
 }

…eSharp/Formats/Png/APngBlendOperation.cs …geSharp/Formats/Png/PngBlendOperation.cssrc/ImageSharp/Formats/Png/APngBlendOperation.cs renamed to src/ImageSharp/Formats/Png/PngBlendOperation.cs src/ImageSharp/Formats/Png/APngBlendOperation.cs renamed to src/ImageSharp/Formats/Png/PngBlendOperation.cs

@@ -6,7 +6,7 @@ namespace SixLabors.ImageSharp.Formats.Png;
 /// <summary>
 /// Specifies whether the frame is to be alpha blended into the current output buffer content, or whether it should completely replace its region in the output buffer.
 /// </summary>
-public enum APngBlendOperation
+public enum PngBlendOperation
 {
     /// <summary>
     /// All color components of the frame, including alpha, overwrite the current contents of the frame's output buffer region.

src/ImageSharp/Formats/Png/PngConstants.cs

@@ -80,5 +80,24 @@ internal static class PngConstants
     /// <summary>
     /// Gets the keyword of the XMP metadata, encoded in an iTXT chunk.
     /// </summary>
-    public static ReadOnlySpan<byte> XmpKeyword => "XML:com.adobe.xmp"u8;
+    public static ReadOnlySpan<byte> XmpKeyword => new[]
+    {
+        (byte)'X',
+        (byte)'M',
+        (byte)'L',
+        (byte)':',
+        (byte)'c',
+        (byte)'o',
+        (byte)'m',
+        (byte)'.',
+        (byte)'a',
+        (byte)'d',
+        (byte)'o',
+        (byte)'b',
+        (byte)'e',
+        (byte)'.',
+        (byte)'x',
+        (byte)'m',
+        (byte)'p'
+    };
 }

src/ImageSharp/Formats/Png/PngDecoderCore.cs

@@ -28,11 +28,6 @@ namespace SixLabors.ImageSharp.Formats.Png;
 /// </summary>
 internal sealed class PngDecoderCore : IImageDecoderInternals
 {
-    /// <summary>
-    /// Indicate whether the file is a simple PNG.
-    /// </summary>
-    private bool isSimplePng;
-
     /// <summary>
     /// The general decoder options.
     /// </summary>
@@ -66,7 +61,7 @@ internal sealed class PngDecoderCore : IImageDecoderInternals
     /// <summary>
     /// The png animation control.
     /// </summary>
-    private APngAnimationControl? animationControl;
+    private AnimationControl? animationControl;
 
     /// <summary>
     /// The number of bytes per pixel.
@@ -149,7 +144,7 @@ public Image<TPixel> Decode<TPixel>(BufferedReadStream stream, CancellationToken
         this.currentStream = stream;
         this.currentStream.Skip(8);
         Image<TPixel>? image = null;
-        APngFrameControl? lastFrameControl = null;
+        FrameControl? lastFrameControl = null;
         ImageFrame<TPixel>? currentFrame = null;
         Span<byte> buffer = stackalloc byte[20];
 
@@ -170,11 +165,6 @@ public Image<TPixel> Decode<TPixel>(BufferedReadStream stream, CancellationToken
                             this.ReadHeaderChunk(pngMetadata, chunk.Data.GetSpan());
                             break;
                         case PngChunkType.AnimationControl:
-                            if (this.isSimplePng || this.animationControl is not null)
-                            {
-                                PngThrowHelper.ThrowInvalidAnimationControl();
-                            }
-
                             this.ReadAnimationControlChunk(pngMetadata, chunk.Data.GetSpan());
                             break;
                         case PngChunkType.Physical:
@@ -184,11 +174,6 @@ public Image<TPixel> Decode<TPixel>(BufferedReadStream stream, CancellationToken
                             ReadGammaChunk(pngMetadata, chunk.Data.GetSpan());
                             break;
                         case PngChunkType.FrameControl:
-                            if (this.isSimplePng)
-                            {
-                                continue;
-                            }
-
                             currentFrame = null;
                             lastFrameControl = this.ReadFrameControlChunk(chunk.Data.GetSpan());
                             break;
@@ -228,11 +213,6 @@ public Image<TPixel> Decode<TPixel>(BufferedReadStream stream, CancellationToken
                             lastFrameControl = null;
                             break;
                         case PngChunkType.Data:
-                            if (this.animationControl is null)
-                            {
-                                this.isSimplePng = true;
-                            }
-
                             if (image is null)
                             {
                                 this.InitializeImage(metadata, lastFrameControl, out image);
@@ -313,7 +293,7 @@ public ImageInfo Identify(BufferedReadStream stream, CancellationToken cancellat
         ImageMetadata metadata = new();
         PngMetadata pngMetadata = metadata.GetPngMetadata();
         this.currentStream = stream;
-        APngFrameControl? lastFrameControl = null;
+        FrameControl? lastFrameControl = null;
         Span<byte> buffer = stackalloc byte[20];
 
         this.currentStream.Skip(8);
@@ -330,11 +310,6 @@ public ImageInfo Identify(BufferedReadStream stream, CancellationToken cancellat
                             this.ReadHeaderChunk(pngMetadata, chunk.Data.GetSpan());
                             break;
                         case PngChunkType.AnimationControl:
-                            if (this.isSimplePng || this.animationControl is not null)
-                            {
-                                PngThrowHelper.ThrowInvalidAnimationControl();
-                            }
-
                             this.ReadAnimationControlChunk(pngMetadata, chunk.Data.GetSpan());
                             break;
                         case PngChunkType.Physical:
@@ -356,11 +331,6 @@ public ImageInfo Identify(BufferedReadStream stream, CancellationToken cancellat
                             ReadGammaChunk(pngMetadata, chunk.Data.GetSpan());
                             break;
                         case PngChunkType.FrameControl:
-                            if (this.isSimplePng)
-                            {
-                                continue;
-                            }
-
                             lastFrameControl = this.ReadFrameControlChunk(chunk.Data.GetSpan());
                             break;
                         case PngChunkType.FrameData:
@@ -379,11 +349,6 @@ public ImageInfo Identify(BufferedReadStream stream, CancellationToken cancellat
                             this.SkipChunkDataAndCrc(chunk);
                             break;
                         case PngChunkType.Data:
-                            if (this.animationControl is null)
-                            {
-                                this.isSimplePng = true;
-                            }
-
                             // Spec says tRNS must be before IDAT so safe to exit.
                             if (this.colorMetadataOnly)
                             {
@@ -465,7 +430,7 @@ public ImageInfo Identify(BufferedReadStream stream, CancellationToken cancellat
             }
 
             EOF:
-            if (this.header is { Width: 0, Height: 0 })
+            if (this.header.Width == 0 && this.header.Height == 0)
             {
                 PngThrowHelper.ThrowInvalidHeader();
             }
@@ -568,7 +533,7 @@ private static void ReadGammaChunk(PngMetadata pngMetadata, ReadOnlySpan<byte> d
     /// <param name="metadata">The metadata information for the image</param>
     /// <param name="frameControl">The frame control information for the frame</param>
     /// <param name="image">The image that we will populate</param>
-    private void InitializeImage<TPixel>(ImageMetadata metadata, APngFrameControl? frameControl, out Image<TPixel> image)
+    private void InitializeImage<TPixel>(ImageMetadata metadata, FrameControl? frameControl, out Image<TPixel> image)
         where TPixel : unmanaged, IPixel<TPixel>
     {
         image = Image.CreateUninitialized<TPixel>(
@@ -579,7 +544,7 @@ private void InitializeImage<TPixel>(ImageMetadata metadata, APngFrameControl? f
 
         if (frameControl is { } control)
         {
-            APngFrameMetadata frameMetadata = image.Frames.RootFrame.Metadata.GetAPngFrameMetadata();
+            PngFrameMetadata frameMetadata = image.Frames.RootFrame.Metadata.GetPngFrameMetadata();
             frameMetadata.FromChunk(control);
         }
 
@@ -603,12 +568,13 @@ private void InitializeImage<TPixel>(ImageMetadata metadata, APngFrameControl? f
     /// <typeparam name="TPixel">The type the pixels will be</typeparam>
     /// <param name="frameControl">The frame control information for the frame</param>
     /// <param name="image">The image that we will populate</param>
-    private void InitializeFrame<TPixel>(APngFrameControl frameControl, Image<TPixel> image, out ImageFrame<TPixel> frame)
+    /// <param name="frame">The created frame</param>
+    private void InitializeFrame<TPixel>(FrameControl frameControl, Image<TPixel> image, out ImageFrame<TPixel> frame)
         where TPixel : unmanaged, IPixel<TPixel>
     {
         frame = image.Frames.CreateFrame();
 
-        APngFrameMetadata frameMetadata = frame.Metadata.GetAPngFrameMetadata();
+        PngFrameMetadata frameMetadata = frame.Metadata.GetPngFrameMetadata();
 
         frameMetadata.FromChunk(frameControl);
 
@@ -716,7 +682,7 @@ private void DecodePixelData<TPixel>(DeflateStream compressedStream, ImageFrame<
     {
         int currentRow = Adam7.FirstRow[0];
         int currentRowBytesRead = 0;
-        int height = image.Metadata.TryGetAPngFrameMetadata(out APngFrameMetadata? frameMetadata) ? frameMetadata.Height : this.header.Height;
+        int height = image.Metadata.TryGetPngFrameMetadata(out PngFrameMetadata? frameMetadata) ? frameMetadata.Height : this.header.Height;
         while (currentRow < height)
         {
             cancellationToken.ThrowIfCancellationRequested();
@@ -763,7 +729,7 @@ private void DecodePixelData<TPixel>(DeflateStream compressedStream, ImageFrame<
             this.ProcessDefilteredScanline(currentRow, scanlineSpan, image, pngMetadata);
 
             this.SwapScanlineBuffers();
-            ++currentRow;
+            currentRow++;
         }
     }
 
@@ -784,7 +750,7 @@ private void DecodeInterlacedPixelData<TPixel>(DeflateStream compressedStream, I
         int pass = 0;
         int width = this.header.Width;
         int height = this.header.Height;
-        if (image.Metadata.TryGetAPngFrameMetadata(out APngFrameMetadata? frameMetadata))
+        if (image.Metadata.TryGetPngFrameMetadata(out PngFrameMetadata? frameMetadata))
         {
             width = frameMetadata.Width;
             height = frameMetadata.Height;
@@ -797,7 +763,7 @@ private void DecodeInterlacedPixelData<TPixel>(DeflateStream compressedStream, I
 
             if (numColumns == 0)
             {
-                ++pass;
+                pass++;
 
                 // This pass contains no data; skip to next pass
                 continue;
@@ -1124,7 +1090,7 @@ private void AssignTransparentMarkers(ReadOnlySpan<byte> alpha, PngMetadata pngM
     /// <param name="data">The <see cref="T:ReadOnlySpan{byte}"/> containing data.</param>
     private void ReadAnimationControlChunk(PngMetadata pngMetadata, ReadOnlySpan<byte> data)
     {
-        this.animationControl = APngAnimationControl.Parse(data);
+        this.animationControl = AnimationControl.Parse(data);
 
         pngMetadata.NumberPlays = this.animationControl.NumberPlays;
     }
@@ -1133,9 +1099,9 @@ private void ReadAnimationControlChunk(PngMetadata pngMetadata, ReadOnlySpan<byt
     /// Reads a header chunk from the data.
     /// </summary>
     /// <param name="data">The <see cref="T:ReadOnlySpan{byte}"/> containing data.</param>
-    private APngFrameControl ReadFrameControlChunk(ReadOnlySpan<byte> data)
+    private FrameControl ReadFrameControlChunk(ReadOnlySpan<byte> data)
     {
-        APngFrameControl fcTL = APngFrameControl.Parse(data);
+        FrameControl fcTL = FrameControl.Parse(data);
 
         fcTL.Validate(this.header);
 

…harp/Formats/Png/APngDisposeOperation.cs …Sharp/Formats/Png/PngDisposeOperation.cssrc/ImageSharp/Formats/Png/APngDisposeOperation.cs renamed to src/ImageSharp/Formats/Png/PngDisposeOperation.cs src/ImageSharp/Formats/Png/APngDisposeOperation.cs renamed to src/ImageSharp/Formats/Png/PngDisposeOperation.cs

@@ -6,7 +6,7 @@ namespace SixLabors.ImageSharp.Formats.Png;
 /// <summary>
 /// Specifies how the output buffer should be changed at the end of the delay (before rendering the next frame).
 /// </summary>
-public enum APngDisposeOperation
+public enum PngDisposeOperation
 {
     /// <summary>
     /// No disposal is done on this frame before rendering the next; the contents of the output buffer are left as is.

src/ImageSharp/Formats/Png/PngEncoder.cs

@@ -19,11 +19,6 @@ public PngEncoder() =>
         // quantizer with options appropriate to the encoding bit depth.
         this.Quantizer = null!;
 
-    /// <summary>
-    /// Gets whether the file is a simple PNG.
-    /// </summary>
-    public bool? IsSimplePng { get; init; }
-
     /// <summary>
     /// Gets the number of bits per sample or per palette index (not per pixel).
     /// Not all values are allowed for all <see cref="ColorType" /> values.