Merge pull request #2788 from SixLabors/js/multisize-tiff

Allow decoding Tiff of different frame size.

src/ImageSharp/Formats/Bmp/BmpMetadata.cs

@@ -154,4 +154,10 @@ public FormatConnectingMetadata ToFormatConnectingMetadata()
 
     /// <inheritdoc/>
     public BmpMetadata DeepClone() => new(this);
+
+    /// <inheritdoc/>
+    public void AfterImageApply<TPixel>(Image<TPixel> destination)
+        where TPixel : unmanaged, IPixel<TPixel>
+    {
+    }
 }

src/ImageSharp/Formats/Cur/CurDecoderCore.cs

@@ -35,10 +35,6 @@ protected override void SetFrameMetadata(
             curMetadata.Compression = compression;
             curMetadata.BmpBitsPerPixel = bitsPerPixel;
             curMetadata.ColorTable = colorTable;
-            curMetadata.EncodingWidth = curFrameMetadata.EncodingWidth;
-            curMetadata.EncodingHeight = curFrameMetadata.EncodingHeight;
-            curMetadata.HotspotX = curFrameMetadata.HotspotX;
-            curMetadata.HotspotY = curFrameMetadata.HotspotY;
         }
     }
 }

src/ImageSharp/Formats/Cur/CurFrameMetadata.cs

@@ -132,6 +132,16 @@ public FormatConnectingFrameMetadata ToFormatConnectingFrameMetadata()
             EncodingHeight = this.EncodingHeight
         };
 
+    /// <inheritdoc/>
+    public void AfterFrameApply<TPixel>(ImageFrame<TPixel> source, ImageFrame<TPixel> destination)
+        where TPixel : unmanaged, IPixel<TPixel>
+    {
+        float ratioX = destination.Width / (float)source.Width;
+        float ratioY = destination.Height / (float)source.Height;
+        this.EncodingWidth = Scale(this.EncodingWidth, destination.Width, ratioX);
+        this.EncodingHeight = Scale(this.EncodingHeight, destination.Height, ratioY);
+    }
+
     /// <inheritdoc/>
     IDeepCloneable IDeepCloneable.DeepClone() => this.DeepClone();
 
@@ -222,4 +232,14 @@ private PixelTypeInfo GetPixelTypeInfo()
             ColorType = color
         };
     }
+
+    private static byte Scale(byte? value, int destination, float ratio)
+    {
+        if (value is null)
+        {
+            return (byte)Math.Clamp(destination, 0, 255);
+        }
+
+        return Math.Min((byte)MathF.Ceiling(value.Value * ratio), (byte)Math.Clamp(destination, 0, 255));
+    }
 }

src/ImageSharp/Formats/Cur/CurMetadata.cs

@@ -22,10 +22,6 @@ public CurMetadata()
     private CurMetadata(CurMetadata other)
     {
         this.Compression = other.Compression;
-        this.HotspotX = other.HotspotX;
-        this.HotspotY = other.HotspotY;
-        this.EncodingWidth = other.EncodingWidth;
-        this.EncodingHeight = other.EncodingHeight;
         this.BmpBitsPerPixel = other.BmpBitsPerPixel;
 
         if (other.ColorTable?.Length > 0)
@@ -39,28 +35,6 @@ private CurMetadata(CurMetadata other)
     /// </summary>
     public IconFrameCompression Compression { get; set; }
 
-    /// <summary>
-    /// Gets or sets the horizontal coordinates of the hotspot in number of pixels from the left. Derived from the root frame.
-    /// </summary>
-    public ushort HotspotX { get; set; }
-
-    /// <summary>
-    /// Gets or sets the vertical coordinates of the hotspot in number of pixels from the top. Derived from the root frame.
-    /// </summary>
-    public ushort HotspotY { get; set; }
-
-    /// <summary>
-    /// Gets or sets the encoding width. <br />
-    /// Can be any number between 0 and 255. Value 0 means a frame height of 256 pixels or greater. Derived from the root frame.
-    /// </summary>
-    public byte EncodingWidth { get; set; }
-
-    /// <summary>
-    /// Gets or sets the encoding height. <br />
-    /// Can be any number between 0 and 255. Value 0 means a frame height of 256 pixels or greater. Derived from the root frame.
-    /// </summary>
-    public byte EncodingHeight { get; set; }
-
     /// <summary>
     /// Gets or sets the number of bits per pixel.<br/>
     /// Used when <see cref="Compression"/> is <see cref="IconFrameCompression.Bmp"/>
@@ -175,6 +149,12 @@ public FormatConnectingMetadata ToFormatConnectingMetadata()
             ColorTable = this.ColorTable
         };
 
+    /// <inheritdoc/>
+    public void AfterImageApply<TPixel>(Image<TPixel> destination)
+        where TPixel : unmanaged, IPixel<TPixel>
+    {
+    }
+
     /// <inheritdoc/>
     IDeepCloneable IDeepCloneable.DeepClone() => this.DeepClone();
 

src/ImageSharp/Formats/Gif/GifEncoderCore.cs

@@ -209,7 +209,7 @@ private void EncodeAdditionalFrames<TPixel>(
         ImageFrame<TPixel> previousFrame = image.Frames.RootFrame;
 
         // This frame is reused to store de-duplicated pixel buffers.
-        using ImageFrame<TPixel> encodingFrame = new(previousFrame.Configuration, previousFrame.Size());
+        using ImageFrame<TPixel> encodingFrame = new(previousFrame.Configuration, previousFrame.Size);
 
         for (int i = 1; i < image.Frames.Count; i++)
         {

src/ImageSharp/Formats/Gif/GifFrameMetadata.cs

@@ -126,40 +126,15 @@ public FormatConnectingFrameMetadata ToFormatConnectingFrameMetadata()
         };
     }
 
+    /// <inheritdoc/>
+    public void AfterFrameApply<TPixel>(ImageFrame<TPixel> source, ImageFrame<TPixel> destination)
+        where TPixel : unmanaged, IPixel<TPixel>
+    {
+    }
+
     /// <inheritdoc/>
     IDeepCloneable IDeepCloneable.DeepClone() => this.DeepClone();
 
     /// <inheritdoc/>
     public GifFrameMetadata DeepClone() => new(this);
-
-    internal static GifFrameMetadata FromAnimatedMetadata(AnimatedImageFrameMetadata metadata)
-    {
-        // TODO: v4 How do I link the parent metadata to the frame metadata to get the global color table?
-        int index = -1;
-        const float background = 1f;
-        if (metadata.ColorTable.HasValue)
-        {
-            ReadOnlySpan<Color> colorTable = metadata.ColorTable.Value.Span;
-            for (int i = 0; i < colorTable.Length; i++)
-            {
-                Vector4 vector = colorTable[i].ToScaledVector4();
-                if (vector.W < background)
-                {
-                    index = i;
-                }
-            }
-        }
-
-        bool hasTransparency = index >= 0;
-
-        return new()
-        {
-            LocalColorTable = metadata.ColorTable,
-            ColorTableMode = metadata.ColorTableMode,
-            FrameDelay = (int)Math.Round(metadata.Duration.TotalMilliseconds / 10),
-            DisposalMode = metadata.DisposalMode,
-            HasTransparency = hasTransparency,
-            TransparencyIndex = hasTransparency ? unchecked((byte)index) : byte.MinValue,
-        };
-    }
 }

src/ImageSharp/Formats/Gif/GifMetadata.cs

@@ -130,6 +130,12 @@ public FormatConnectingMetadata ToFormatConnectingMetadata()
         };
     }
 
+    /// <inheritdoc/>
+    public void AfterImageApply<TPixel>(Image<TPixel> destination)
+        where TPixel : unmanaged, IPixel<TPixel>
+    {
+    }
+
     /// <inheritdoc/>
     IDeepCloneable IDeepCloneable.DeepClone() => this.DeepClone();
 

src/ImageSharp/Formats/IFormatFrameMetadata.cs

@@ -1,6 +1,8 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using SixLabors.ImageSharp.PixelFormats;
+
 namespace SixLabors.ImageSharp.Formats;
 
 /// <summary>
@@ -13,6 +15,15 @@ public interface IFormatFrameMetadata : IDeepCloneable
     /// </summary>
     /// <returns>The <see cref="FormatConnectingFrameMetadata"/>.</returns>
     FormatConnectingFrameMetadata ToFormatConnectingFrameMetadata();
+
+    /// <summary>
+    /// This method is called after a process has been applied to the image frame.
+    /// </summary>
+    /// <typeparam name="TPixel">The type of pixel format.</typeparam>
+    /// <param name="source">The source image frame.</param>
+    /// <param name="destination">The destination image frame.</param>
+    void AfterFrameApply<TPixel>(ImageFrame<TPixel> source, ImageFrame<TPixel> destination)
+        where TPixel : unmanaged, IPixel<TPixel>;
 }
 
 /// <summary>

src/ImageSharp/Formats/IFormatMetadata.cs

@@ -21,6 +21,14 @@ public interface IFormatMetadata : IDeepCloneable
     /// </summary>
     /// <returns>The <see cref="FormatConnectingMetadata"/>.</returns>
     FormatConnectingMetadata ToFormatConnectingMetadata();
+
+    /// <summary>
+    /// This method is called after a process has been applied to the image.
+    /// </summary>
+    /// <typeparam name="TPixel">The type of pixel format.</typeparam>
+    /// <param name="destination">The destination image .</param>
+    void AfterImageApply<TPixel>(Image<TPixel> destination)
+        where TPixel : unmanaged, IPixel<TPixel>;
 }
 
 /// <summary>

src/ImageSharp/Formats/Ico/IcoDecoderCore.cs

@@ -35,8 +35,6 @@ protected override void SetFrameMetadata(
             curMetadata.Compression = compression;
             curMetadata.BmpBitsPerPixel = bitsPerPixel;
             curMetadata.ColorTable = colorTable;
-            curMetadata.EncodingWidth = icoFrameMetadata.EncodingWidth;
-            curMetadata.EncodingHeight = icoFrameMetadata.EncodingHeight;
         }
     }
 }

src/ImageSharp/Formats/Ico/IcoFrameMetadata.cs

@@ -125,6 +125,16 @@ public FormatConnectingFrameMetadata ToFormatConnectingFrameMetadata()
             EncodingHeight = this.EncodingHeight
         };
 
+    /// <inheritdoc/>
+    public void AfterFrameApply<TPixel>(ImageFrame<TPixel> source, ImageFrame<TPixel> destination)
+        where TPixel : unmanaged, IPixel<TPixel>
+    {
+        float ratioX = destination.Width / (float)source.Width;
+        float ratioY = destination.Height / (float)source.Height;
+        this.EncodingWidth = Scale(this.EncodingWidth, destination.Width, ratioX);
+        this.EncodingHeight = Scale(this.EncodingHeight, destination.Height, ratioY);
+    }
+
     /// <inheritdoc/>
     IDeepCloneable IDeepCloneable.DeepClone() => this.DeepClone();
 
@@ -217,4 +227,14 @@ private PixelTypeInfo GetPixelTypeInfo()
             ColorType = color
         };
     }
+
+    private static byte Scale(byte? value, int destination, float ratio)
+    {
+        if (value is null)
+        {
+            return (byte)Math.Clamp(destination, 0, 255);
+        }
+
+        return Math.Min((byte)MathF.Ceiling(value.Value * ratio), (byte)Math.Clamp(destination, 0, 255));
+    }
 }

src/ImageSharp/Formats/Ico/IcoMetadata.cs

@@ -22,8 +22,6 @@ public IcoMetadata()
     private IcoMetadata(IcoMetadata other)
     {
         this.Compression = other.Compression;
-        this.EncodingWidth = other.EncodingWidth;
-        this.EncodingHeight = other.EncodingHeight;
         this.BmpBitsPerPixel = other.BmpBitsPerPixel;
 
         if (other.ColorTable?.Length > 0)
@@ -37,18 +35,6 @@ private IcoMetadata(IcoMetadata other)
     /// </summary>
     public IconFrameCompression Compression { get; set; }
 
-    /// <summary>
-    /// Gets or sets the encoding width. <br />
-    /// Can be any number between 0 and 255. Value 0 means a frame height of 256 pixels or greater. Derived from the root frame.
-    /// </summary>
-    public byte EncodingWidth { get; set; }
-
-    /// <summary>
-    /// Gets or sets the encoding height. <br />
-    /// Can be any number between 0 and 255. Value 0 means a frame height of 256 pixels or greater. Derived from the root frame.
-    /// </summary>
-    public byte EncodingHeight { get; set; }
-
     /// <summary>
     /// Gets or sets the number of bits per pixel.<br/>
     /// Used when <see cref="Compression"/> is <see cref="IconFrameCompression.Bmp"/>
@@ -163,6 +149,12 @@ public FormatConnectingMetadata ToFormatConnectingMetadata()
             ColorTable = this.ColorTable
         };
 
+    /// <inheritdoc/>
+    public void AfterImageApply<TPixel>(Image<TPixel> destination)
+        where TPixel : unmanaged, IPixel<TPixel>
+    {
+    }
+
     /// <inheritdoc/>
     IDeepCloneable IDeepCloneable.DeepClone() => this.DeepClone();
 

src/ImageSharp/Formats/Jpeg/JpegMetadata.cs

@@ -199,6 +199,12 @@ public FormatConnectingMetadata ToFormatConnectingMetadata()
             Quality = this.Quality,
         };
 
+    /// <inheritdoc/>
+    public void AfterImageApply<TPixel>(Image<TPixel> destination)
+        where TPixel : unmanaged, IPixel<TPixel>
+    {
+    }
+
     /// <inheritdoc/>
     IDeepCloneable IDeepCloneable.DeepClone() => this.DeepClone();
 

src/ImageSharp/Formats/Pbm/PbmMetadata.cs

@@ -129,6 +129,12 @@ public FormatConnectingMetadata ToFormatConnectingMetadata()
             PixelTypeInfo = this.GetPixelTypeInfo(),
         };
 
+    /// <inheritdoc/>
+    public void AfterImageApply<TPixel>(Image<TPixel> destination)
+        where TPixel : unmanaged, IPixel<TPixel>
+    {
+    }
+
     /// <inheritdoc/>
     IDeepCloneable IDeepCloneable.DeepClone() => this.DeepClone();
 

src/ImageSharp/Formats/Png/PngEncoderCore.cs

@@ -231,7 +231,7 @@ public void Encode<TPixel>(Image<TPixel> image, Stream stream, CancellationToken
             ImageFrame<TPixel> previousFrame = image.Frames.RootFrame;
 
             // This frame is reused to store de-duplicated pixel buffers.
-            using ImageFrame<TPixel> encodingFrame = new(image.Configuration, previousFrame.Size());
+            using ImageFrame<TPixel> encodingFrame = new(image.Configuration, previousFrame.Size);
 
             for (; currentFrameIndex < image.Frames.Count; currentFrameIndex++)
             {