Refactor and cleanup

Author: JimBobSquarePants

src/ImageSharp/Formats/Png/Chunks/FrameControl.cs

@@ -10,22 +10,22 @@ internal readonly struct FrameControl
     public const int Size = 26;
 
     public FrameControl(
-        int sequenceNumber,
-        int width,
-        int height,
-        int xOffset,
-        int yOffset,
-        short delayNumber,
-        short delayDenominator,
-        PngDisposeOperation disposeOperation,
-        PngBlendOperation blendOperation)
+        uint sequenceNumber,
+        uint width,
+        uint height,
+        uint xOffset,
+        uint yOffset,
+        ushort delayNumerator,
+        ushort delayDenominator,
+        PngDisposalMethod disposeOperation,
+        PngBlendMethod blendOperation)
     {
         this.SequenceNumber = sequenceNumber;
         this.Width = width;
         this.Height = height;
         this.XOffset = xOffset;
         this.YOffset = yOffset;
-        this.DelayNumber = delayNumber;
+        this.DelayNumerator = delayNumerator;
         this.DelayDenominator = delayDenominator;
         this.DisposeOperation = disposeOperation;
         this.BlendOperation = blendOperation;
@@ -34,130 +34,101 @@ public FrameControl(
     /// <summary>
     /// Gets the sequence number of the animation chunk, starting from 0
     /// </summary>
-    public int SequenceNumber { get; }
+    public uint SequenceNumber { get; }
 
     /// <summary>
     /// Gets the width of the following frame
     /// </summary>
-    public int Width { get; }
+    public uint Width { get; }
 
     /// <summary>
     /// Gets the height of the following frame
     /// </summary>
-    public int Height { get; }
+    public uint Height { get; }
 
     /// <summary>
     /// Gets the X position at which to render the following frame
     /// </summary>
-    public int XOffset { get; }
+    public uint XOffset { get; }
 
     /// <summary>
     /// Gets the Y position at which to render the following frame
     /// </summary>
-    public int YOffset { get; }
+    public uint YOffset { get; }
 
     /// <summary>
     /// Gets the X limit at which to render the following frame
     /// </summary>
-    public uint XLimit => (uint)(this.XOffset + this.Width);
+    public uint XMax => this.XOffset + this.Width;
 
     /// <summary>
     /// Gets the Y limit at which to render the following frame
     /// </summary>
-    public uint YLimit => (uint)(this.YOffset + this.Height);
+    public uint YMax => this.YOffset + this.Height;
 
     /// <summary>
     /// Gets the frame delay fraction numerator
     /// </summary>
-    public short DelayNumber { get; }
+    public ushort DelayNumerator { get; }
 
     /// <summary>
     /// Gets the frame delay fraction denominator
     /// </summary>
-    public short DelayDenominator { get; }
+    public ushort DelayDenominator { get; }
 
     /// <summary>
     /// Gets the type of frame area disposal to be done after rendering this frame
     /// </summary>
-    public PngDisposeOperation DisposeOperation { get; }
+    public PngDisposalMethod DisposeOperation { get; }
 
     /// <summary>
     /// Gets the type of frame area rendering for this frame
     /// </summary>
-    public PngBlendOperation BlendOperation { get; }
+    public PngBlendMethod BlendOperation { get; }
 
     /// <summary>
     /// Validates the APng fcTL.
     /// </summary>
+    /// <param name="header">The header.</param>
     /// <exception cref="NotSupportedException">
     /// Thrown if the image does pass validation.
     /// </exception>
-    public void Validate(PngHeader hdr)
+    public void Validate(PngHeader header)
     {
-        if (this.XOffset < 0)
-        {
-            PngThrowHelper.ThrowInvalidParameter(this.XOffset, "Expected >= 0");
-        }
-
-        if (this.YOffset < 0)
-        {
-            PngThrowHelper.ThrowInvalidParameter(this.YOffset, "Expected >= 0");
-        }
-
-        if (this.Width <= 0)
+        if (this.Width == 0)
         {
             PngThrowHelper.ThrowInvalidParameter(this.Width, "Expected > 0");
         }
 
-        if (this.Height <= 0)
+        if (this.Height == 0)
         {
             PngThrowHelper.ThrowInvalidParameter(this.Height, "Expected > 0");
         }
 
-        if (this.XLimit > hdr.Width)
+        if (this.XMax > header.Width)
         {
-            PngThrowHelper.ThrowInvalidParameter(this.XOffset, this.Width, $"The sum of them > {nameof(PngHeader)}.{nameof(PngHeader.Width)}");
+            PngThrowHelper.ThrowInvalidParameter(this.XOffset, this.Width, $"The x-offset plus width > {nameof(PngHeader)}.{nameof(PngHeader.Width)}");
         }
 
-        if (this.YLimit > hdr.Height)
+        if (this.YMax > header.Height)
         {
-            PngThrowHelper.ThrowInvalidParameter(this.YOffset, this.Height, $"The sum of them > {nameof(PngHeader)}.{nameof(PngHeader.Height)}");
+            PngThrowHelper.ThrowInvalidParameter(this.YOffset, this.Height, $"The y-offset plus height > {nameof(PngHeader)}.{nameof(PngHeader.Height)}");
         }
     }
 
-    /// <summary>
-    /// Parses the APngFrameControl from the given metadata.
-    /// </summary>
-    /// <param name="frameMetadata">The metadata to parse.</param>
-    /// <param name="sequenceNumber">Sequence number.</param>
-    public static FrameControl FromMetadata(PngFrameMetadata frameMetadata, int sequenceNumber)
-    {
-        FrameControl fcTL = new(
-            sequenceNumber,
-            frameMetadata.Width,
-            frameMetadata.Height,
-            frameMetadata.XOffset,
-            frameMetadata.YOffset,
-            frameMetadata.DelayNumber,
-            frameMetadata.DelayDenominator,
-            frameMetadata.DisposeOperation,
-            frameMetadata.BlendOperation);
-        return fcTL;
-    }
-
     /// <summary>
     /// Writes the fcTL to the given buffer.
     /// </summary>
     /// <param name="buffer">The buffer to write to.</param>
     public void WriteTo(Span<byte> buffer)
     {
-        BinaryPrimitives.WriteInt32BigEndian(buffer[..4], this.SequenceNumber);
-        BinaryPrimitives.WriteInt32BigEndian(buffer[4..8], this.Width);
-        BinaryPrimitives.WriteInt32BigEndian(buffer[8..12], this.Height);
-        BinaryPrimitives.WriteInt32BigEndian(buffer[12..16], this.XOffset);
-        BinaryPrimitives.WriteInt32BigEndian(buffer[16..20], this.YOffset);
-        BinaryPrimitives.WriteInt16BigEndian(buffer[20..22], this.DelayNumber);
-        BinaryPrimitives.WriteInt16BigEndian(buffer[22..24], this.DelayDenominator);
+        BinaryPrimitives.WriteUInt32BigEndian(buffer[..4], this.SequenceNumber);
+        BinaryPrimitives.WriteUInt32BigEndian(buffer[4..8], this.Width);
+        BinaryPrimitives.WriteUInt32BigEndian(buffer[8..12], this.Height);
+        BinaryPrimitives.WriteUInt32BigEndian(buffer[12..16], this.XOffset);
+        BinaryPrimitives.WriteUInt32BigEndian(buffer[16..20], this.YOffset);
+        BinaryPrimitives.WriteUInt16BigEndian(buffer[20..22], this.DelayNumerator);
+        BinaryPrimitives.WriteUInt16BigEndian(buffer[22..24], this.DelayDenominator);
 
         buffer[24] = (byte)this.DisposeOperation;
         buffer[25] = (byte)this.BlendOperation;
@@ -170,13 +141,13 @@ public void WriteTo(Span<byte> buffer)
     /// <returns>The parsed fcTL.</returns>
     public static FrameControl Parse(ReadOnlySpan<byte> data)
         => new(
-            sequenceNumber: BinaryPrimitives.ReadInt32BigEndian(data[..4]),
-            width: BinaryPrimitives.ReadInt32BigEndian(data[4..8]),
-            height: BinaryPrimitives.ReadInt32BigEndian(data[8..12]),
-            xOffset: BinaryPrimitives.ReadInt32BigEndian(data[12..16]),
-            yOffset: BinaryPrimitives.ReadInt32BigEndian(data[16..20]),
-            delayNumber: BinaryPrimitives.ReadInt16BigEndian(data[20..22]),
-            delayDenominator: BinaryPrimitives.ReadInt16BigEndian(data[22..24]),
-            disposeOperation: (PngDisposeOperation)data[24],
-            blendOperation: (PngBlendOperation)data[25]);
+            sequenceNumber: BinaryPrimitives.ReadUInt32BigEndian(data[..4]),
+            width: BinaryPrimitives.ReadUInt32BigEndian(data[4..8]),
+            height: BinaryPrimitives.ReadUInt32BigEndian(data[8..12]),
+            xOffset: BinaryPrimitives.ReadUInt32BigEndian(data[12..16]),
+            yOffset: BinaryPrimitives.ReadUInt32BigEndian(data[16..20]),
+            delayNumerator: BinaryPrimitives.ReadUInt16BigEndian(data[20..22]),
+            delayDenominator: BinaryPrimitives.ReadUInt16BigEndian(data[22..24]),
+            disposeOperation: (PngDisposalMethod)data[24],
+            blendOperation: (PngBlendMethod)data[25]);
 }

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

@@ -1,12 +1,12 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
 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 PngBlendOperation
+public enum PngBlendMethod
 {
     /// <summary>
     /// All color components of the frame, including alpha, overwrite the current contents of the frame's output buffer region.