Merge branch 'main' into js/png-pallete

Author: JimBobSquarePants

.github/workflows/build-and-test.yml

@@ -9,6 +9,7 @@ on:
   pull_request:
     branches:
       - main
+      - release/*
     types: [ labeled, opened, synchronize, reopened ]
 jobs:
   Build:

src/ImageSharp/Advanced/ParallelRowIterator.cs

@@ -50,7 +50,7 @@ public static void IterateRows<T>(
         int width = rectangle.Width;
         int height = rectangle.Height;
 
-        int maxSteps = DivideCeil(width * height, parallelSettings.MinimumPixelsProcessedPerTask);
+        int maxSteps = DivideCeil(width * (long)height, parallelSettings.MinimumPixelsProcessedPerTask);
         int numOfSteps = Math.Min(parallelSettings.MaxDegreeOfParallelism, maxSteps);
 
         // Avoid TPL overhead in this trivial case:
@@ -115,7 +115,7 @@ public static void IterateRows<T, TBuffer>(
         int width = rectangle.Width;
         int height = rectangle.Height;
 
-        int maxSteps = DivideCeil(width * height, parallelSettings.MinimumPixelsProcessedPerTask);
+        int maxSteps = DivideCeil(width * (long)height, parallelSettings.MinimumPixelsProcessedPerTask);
         int numOfSteps = Math.Min(parallelSettings.MaxDegreeOfParallelism, maxSteps);
         MemoryAllocator allocator = parallelSettings.MemoryAllocator;
         int bufferLength = Unsafe.AsRef(operation).GetRequiredBufferLength(rectangle);
@@ -180,7 +180,7 @@ public static void IterateRowIntervals<T>(
         int width = rectangle.Width;
         int height = rectangle.Height;
 
-        int maxSteps = DivideCeil(width * height, parallelSettings.MinimumPixelsProcessedPerTask);
+        int maxSteps = DivideCeil(width * (long)height, parallelSettings.MinimumPixelsProcessedPerTask);
         int numOfSteps = Math.Min(parallelSettings.MaxDegreeOfParallelism, maxSteps);
 
         // Avoid TPL overhead in this trivial case:
@@ -242,7 +242,7 @@ public static void IterateRowIntervals<T, TBuffer>(
         int width = rectangle.Width;
         int height = rectangle.Height;
 
-        int maxSteps = DivideCeil(width * height, parallelSettings.MinimumPixelsProcessedPerTask);
+        int maxSteps = DivideCeil(width * (long)height, parallelSettings.MinimumPixelsProcessedPerTask);
         int numOfSteps = Math.Min(parallelSettings.MaxDegreeOfParallelism, maxSteps);
         MemoryAllocator allocator = parallelSettings.MemoryAllocator;
         int bufferLength = Unsafe.AsRef(operation).GetRequiredBufferLength(rectangle);
@@ -270,7 +270,7 @@ public static void IterateRowIntervals<T, TBuffer>(
     }
 
     [MethodImpl(InliningOptions.ShortMethod)]
-    private static int DivideCeil(int dividend, int divisor) => 1 + ((dividend - 1) / divisor);
+    private static int DivideCeil(long dividend, int divisor) => (int)Math.Min(1 + ((dividend - 1) / divisor), int.MaxValue);
 
     private static void ValidateRectangle(Rectangle rectangle)
     {

src/ImageSharp/Formats/Gif/GifDecoderCore.cs

@@ -710,10 +710,10 @@ private void SetFrameMetadata(ImageFrameMetadata metadata)
             gifMeta.ColorTableMode = GifColorTableMode.Local;
 
             Color[] colorTable = new Color[this.imageDescriptor.LocalColorTableSize];
-            ref Rgb24 localBase = ref MemoryMarshal.GetReference(MemoryMarshal.Cast<byte, Rgb24>(this.currentLocalColorTable!.GetSpan()[..this.currentLocalColorTableSize]));
+            ReadOnlySpan<Rgb24> rgbTable = MemoryMarshal.Cast<byte, Rgb24>(this.currentLocalColorTable!.GetSpan()[..this.currentLocalColorTableSize]);
             for (int i = 0; i < colorTable.Length; i++)
             {
-                colorTable[i] = new Color(Unsafe.Add(ref localBase, (uint)i));
+                colorTable[i] = new Color(rgbTable[i]);
             }
 
             gifMeta.LocalColorTable = colorTable;
@@ -784,13 +784,14 @@ private void ReadLogicalScreenDescriptorAndGlobalColorTable(BufferedReadStream s
                 this.globalColorTable = this.memoryAllocator.Allocate<byte>(globalColorTableLength, AllocationOptions.Clean);
 
                 // Read the global color table data from the stream and preserve it in the gif metadata
-                stream.Read(this.globalColorTable.GetSpan());
+                Span<byte> globalColorTableSpan = this.globalColorTable.GetSpan();
+                stream.Read(globalColorTableSpan);
 
                 Color[] colorTable = new Color[this.logicalScreenDescriptor.GlobalColorTableSize];
-                ref Rgb24 globalBase = ref MemoryMarshal.GetReference(MemoryMarshal.Cast<byte, Rgb24>(this.globalColorTable.GetSpan()));
+                ReadOnlySpan<Rgb24> rgbTable = MemoryMarshal.Cast<byte, Rgb24>(globalColorTableSpan);
                 for (int i = 0; i < colorTable.Length; i++)
                 {
-                    colorTable[i] = new Color(Unsafe.Add(ref globalBase, (uint)i));
+                    colorTable[i] = new Color(rgbTable[i]);
                 }
 
                 this.gifMetadata.GlobalColorTable = colorTable;

src/ImageSharp/Formats/Gif/GifEncoderCore.cs

@@ -135,7 +135,7 @@ public void Encode<TPixel>(Image<TPixel> image, Stream stream, CancellationToken
         byte backgroundIndex = unchecked((byte)transparencyIndex);
         if (transparencyIndex == -1)
         {
-            backgroundIndex = gifMetadata.BackgroundColor;
+            backgroundIndex = gifMetadata.BackgroundColorIndex;
         }
 
         // Get the number of bits.
@@ -236,18 +236,19 @@ private void EncodeFirstFrame<TPixel>(
     {
         this.WriteGraphicalControlExtension(metadata, transparencyIndex, stream);
 
-        Buffer2DRegion<byte> region = ((IPixelSource)quantized).PixelBuffer.GetRegion();
+        Buffer2D<byte> indices = ((IPixelSource)quantized).PixelBuffer;
+        Rectangle interest = indices.FullRectangle();
         bool useLocal = this.colorTableMode == GifColorTableMode.Local || (metadata?.ColorTableMode == GifColorTableMode.Local);
         int bitDepth = ColorNumerics.GetBitsNeededForColorDepth(quantized.Palette.Length);
 
-        this.WriteImageDescriptor(region.Rectangle, useLocal, bitDepth, stream);
+        this.WriteImageDescriptor(interest, useLocal, bitDepth, stream);
 
         if (useLocal)
         {
             this.WriteColorTable(quantized, bitDepth, stream);
         }
 
-        this.WriteImageData(region, stream, quantized.Palette.Length, transparencyIndex);
+        this.WriteImageData(indices, interest, stream, quantized.Palette.Length, transparencyIndex);
     }
 
     private void EncodeAdditionalFrame<TPixel>(
@@ -322,20 +323,20 @@ private void EncodeAdditionalFrame<TPixel>(
         transparencyIndex = GetTransparentIndex(quantized, metadata);
 
         // Trim down the buffer to the minimum size required.
-        // Buffer2DRegion<byte> region = ((IPixelSource)quantized).PixelBuffer.GetRegion();
-        Buffer2DRegion<byte> region = TrimTransparentPixels(((IPixelSource)quantized).PixelBuffer, transparencyIndex);
+        Buffer2D<byte> indices = ((IPixelSource)quantized).PixelBuffer;
+        Rectangle interest = TrimTransparentPixels(indices, transparencyIndex);
 
         this.WriteGraphicalControlExtension(metadata, transparencyIndex, stream);
 
         int bitDepth = ColorNumerics.GetBitsNeededForColorDepth(quantized.Palette.Length);
-        this.WriteImageDescriptor(region.Rectangle, useLocal, bitDepth, stream);
+        this.WriteImageDescriptor(interest, useLocal, bitDepth, stream);
 
         if (useLocal)
         {
             this.WriteColorTable(quantized, bitDepth, stream);
         }
 
-        this.WriteImageData(region, stream, quantized.Palette.Length, transparencyIndex);
+        this.WriteImageData(indices, interest, stream, quantized.Palette.Length, transparencyIndex);
     }
 
     private void DeDuplicatePixels<TPixel>(
@@ -399,11 +400,11 @@ private void DeDuplicatePixels<TPixel>(
         }
     }
 
-    private static Buffer2DRegion<byte> TrimTransparentPixels(Buffer2D<byte> buffer, int transparencyIndex)
+    private static Rectangle TrimTransparentPixels(Buffer2D<byte> buffer, int transparencyIndex)
     {
         if (transparencyIndex < 0)
         {
-            return buffer.GetRegion();
+            return buffer.FullRectangle();
         }
 
         byte trimmableIndex = unchecked((byte)transparencyIndex);
@@ -596,7 +597,7 @@ private static Buffer2DRegion<byte> TrimTransparentPixels(Buffer2D<byte> buffer,
         if (top == bottom || left == right)
         {
             // The entire image is transparent.
-            return buffer.GetRegion();
+            return buffer.FullRectangle();
         }
 
         if (!isTransparentRow)
@@ -605,7 +606,7 @@ private static Buffer2DRegion<byte> TrimTransparentPixels(Buffer2D<byte> buffer,
             bottom = buffer.Height;
         }
 
-        return buffer.GetRegion(Rectangle.FromLTRB(left, top, Math.Min(right + 1, buffer.Width), Math.Min(bottom + 1, buffer.Height)));
+        return Rectangle.FromLTRB(left, top, Math.Min(right + 1, buffer.Width), Math.Min(bottom + 1, buffer.Height));
     }
 
     /// <summary>
@@ -923,11 +924,14 @@ private void WriteColorTable<TPixel>(IndexedImageFrame<TPixel> image, int bitDep
     /// Writes the image pixel data to the stream.
     /// </summary>
     /// <param name="indices">The <see cref="Buffer2DRegion{Byte}"/> containing indexed pixels.</param>
+    /// <param name="interest">The region of interest.</param>
     /// <param name="stream">The stream to write to.</param>
     /// <param name="paletteLength">The length of the frame color palette.</param>
     /// <param name="transparencyIndex">The index of the color used to represent transparency.</param>
-    private void WriteImageData(Buffer2DRegion<byte> indices, Stream stream, int paletteLength, int transparencyIndex)
+    private void WriteImageData(Buffer2D<byte> indices, Rectangle interest, Stream stream, int paletteLength, int transparencyIndex)
     {
+        Buffer2DRegion<byte> region = indices.GetRegion(interest);
+
         // Pad the bit depth when required for encoding the image data.
         // This is a common trick which allows to use out of range indexes for transparency and avoid allocating a larger color palette
         // as decoders skip indexes that are out of range.
@@ -936,6 +940,6 @@ private void WriteImageData(Buffer2DRegion<byte> indices, Stream stream, int pal
             : 0;
 
         using LzwEncoder encoder = new(this.memoryAllocator, ColorNumerics.GetBitsNeededForColorDepth(paletteLength + padding));
-        encoder.Encode(indices, stream);
+        encoder.Encode(region, stream);
     }
 }

src/ImageSharp/Formats/Gif/GifFrameMetadata.cs

@@ -1,6 +1,8 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using SixLabors.ImageSharp.PixelFormats;
+
 namespace SixLabors.ImageSharp.Formats.Gif;
 
 /// <summary>
@@ -41,6 +43,7 @@ private GifFrameMetadata(GifFrameMetadata other)
 
     /// <summary>
     /// Gets or sets the local color table, if any.
+    /// The underlying pixel format is represented by <see cref="Rgb24"/>.
     /// </summary>
     public ReadOnlyMemory<Color>? LocalColorTable { get; set; }
 

src/ImageSharp/Formats/Gif/GifMetadata.cs

@@ -1,6 +1,8 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using SixLabors.ImageSharp.PixelFormats;
+
 namespace SixLabors.ImageSharp.Formats.Gif;
 
 /// <summary>
@@ -23,7 +25,7 @@ private GifMetadata(GifMetadata other)
     {
         this.RepeatCount = other.RepeatCount;
         this.ColorTableMode = other.ColorTableMode;
-        this.BackgroundColor = other.BackgroundColor;
+        this.BackgroundColorIndex = other.BackgroundColorIndex;
 
         if (other.GlobalColorTable?.Length > 0)
         {
@@ -51,14 +53,15 @@ private GifMetadata(GifMetadata other)
 
     /// <summary>
     /// Gets or sets the global color table, if any.
+    /// The underlying pixel format is represented by <see cref="Rgb24"/>.
     /// </summary>
     public ReadOnlyMemory<Color>? GlobalColorTable { get; set; }
 
     /// <summary>
     /// Gets or sets the index at the <see cref="GlobalColorTable"/> for the background color.
     /// The background color is the color used for those pixels on the screen that are not covered by an image.
     /// </summary>
-    public byte BackgroundColor { get; set; }
+    public byte BackgroundColorIndex { get; set; }
 
     /// <summary>
     /// Gets or sets the collection of comments about the graphics, credits, descriptions or any

src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegBitReader.cs

@@ -212,7 +212,12 @@ public bool FindNextMarker()
     private int ReadStream()
     {
         int value = this.badData ? 0 : this.stream.ReadByte();
-        if (value == -1)
+
+        // We've encountered the end of the file stream which means there's no EOI marker or the marker has been read
+        // during decoding of the SOS marker.
+        // When reading individual bits 'badData' simply means we have hit a marker, When data is '0' and the stream is exhausted
+        // we know we have hit the EOI and completed decoding the scan buffer.
+        if (value == -1 || (this.badData && this.data == 0 && this.stream.Position >= this.stream.Length))
         {
             // We've encountered the end of the file stream which means there's no EOI marker
             // in the image or the SOS marker has the wrong dimensions set.

src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs

@@ -158,6 +158,7 @@ public void Encode<TPixel>(Image<TPixel> image, Stream stream, CancellationToken
         long ifdMarker = WriteHeader(writer, buffer);
 
         Image<TPixel> metadataImage = image;
+
         foreach (ImageFrame<TPixel> frame in image.Frames)
         {
             cancellationToken.ThrowIfCancellationRequested();
@@ -236,9 +237,13 @@ private long WriteFrame<TPixel>(
 
         if (image != null)
         {
+            // Write the metadata for the root image
             entriesCollector.ProcessMetadata(image, this.skipMetadata);
         }
 
+        // Write the metadata for the frame
+        entriesCollector.ProcessMetadata(frame, this.skipMetadata);
+
         entriesCollector.ProcessFrameInfo(frame, imageMetadata);
         entriesCollector.ProcessImageFormat(this);