Merge branch 'main' into stefannikolei/arm/componentconverter

Author: JimBobSquarePants

src/ImageSharp/Formats/Jpeg/Components/Decoder/SpectralConverter{TPixel}.cs

@@ -184,34 +184,39 @@ public override void PrepareForDecoding()
 
         MemoryAllocator allocator = this.Configuration.MemoryAllocator;
 
-        // color converter from RGB to TPixel
+        // Color converter from RGB to TPixel
         JpegColorConverterBase converter = this.GetColorConverter(this.frame, this.jpegData);
         this.colorConverter = converter;
 
-        // resulting image size
+        // Resulting image size
         Size pixelSize = CalculateResultingImageSize(this.frame.PixelSize, this.targetSize, out int blockPixelSize);
 
-        // iteration data
+        // Iteration data
         int majorBlockWidth = this.frame.Components.Max((component) => component.SizeInBlocks.Width);
         int majorVerticalSamplingFactor = this.frame.Components.Max((component) => component.SamplingFactors.Height);
 
         this.pixelRowsPerStep = majorVerticalSamplingFactor * blockPixelSize;
 
-        // pixel buffer for resulting image
+        // Pixel buffer for resulting image
         this.pixelBuffer = allocator.Allocate2D<TPixel>(
             pixelSize.Width,
             pixelSize.Height,
             this.Configuration.PreferContiguousImageBuffers);
         this.paddedProxyPixelRow = allocator.Allocate<TPixel>(pixelSize.Width + 3);
 
-        // component processors from spectral to RGB
+        // Component processors from spectral to RGB
         int bufferWidth = majorBlockWidth * blockPixelSize;
-        int batchSize = converter.ElementsPerBatch;
-        int batchRemainder = bufferWidth & (batchSize - 1);
-        Size postProcessorBufferSize = new(bufferWidth + (batchSize - batchRemainder), this.pixelRowsPerStep);
+
+        // Converters process pixels in batches and require target buffer size to be divisible by a batch size
+        // Corner case: image size including jpeg padding is already divisible by a batch size or remainder == 0
+        int elementsPerBatch = converter.ElementsPerBatch;
+        int batchRemainder = bufferWidth & (elementsPerBatch - 1);
+        int widthComplementaryValue = batchRemainder == 0 ? 0 : elementsPerBatch - batchRemainder;
+
+        Size postProcessorBufferSize = new(bufferWidth + widthComplementaryValue, this.pixelRowsPerStep);
         this.componentProcessors = this.CreateComponentProcessors(this.frame, this.jpegData, blockPixelSize, postProcessorBufferSize);
 
-        // single 'stride' rgba32 buffer for conversion between spectral and TPixel
+        // Single 'stride' rgba32 buffer for conversion between spectral and TPixel
         this.rgbBuffer = allocator.Allocate<byte>(pixelSize.Width * 3);
     }
 

src/ImageSharp/Image.FromFile.cs

@@ -81,7 +81,7 @@ public static async Task<IImageFormat> DetectFormatAsync(
     /// A return value indicates whether the operation succeeded.
     /// </summary>
     /// <param name="path">The image file to open and to read the header from.</param>
-    /// <returns><see langword="true"/> if the information can be read; otherwise, <see langword="false"/></returns>
+    /// <returns>The <see cref="ImageInfo"/>.</returns>
     /// <exception cref="ArgumentNullException">The path is null.</exception>
     /// <exception cref="NotSupportedException">The file stream is not readable or the image format is not supported.</exception>
     /// <exception cref="InvalidImageContentException">The encoded image contains invalid content.</exception>

src/ImageSharp/Image.FromStream.cs

@@ -29,7 +29,7 @@ public static IImageFormat DetectFormat(Stream stream)
     /// </summary>
     /// <param name="options">The general decoder options.</param>
     /// <param name="stream">The image stream to read the header from.</param>
-    /// <returns><see langword="true"/> if a match is found; otherwise, <see langword="false"/></returns>
+    /// <returns>The <see cref="IImageFormat"/>.</returns>
     /// <exception cref="ArgumentNullException">The options are null.</exception>
     /// <exception cref="ArgumentNullException">The stream is null.</exception>
     /// <exception cref="NotSupportedException">The stream is not readable or the image format is not supported.</exception>
@@ -79,7 +79,7 @@ public static Task<IImageFormat> DetectFormatAsync(
     /// Reads the raw image information from the specified stream without fully decoding it.
     /// </summary>
     /// <param name="stream">The image stream to read the header from.</param>
-    /// <returns><see langword="true"/> if the information can be read; otherwise, <see langword="false"/></returns>
+    /// <returns>The <see cref="ImageInfo"/>.</returns>
     /// <exception cref="ArgumentNullException">The stream is null.</exception>
     /// <exception cref="NotSupportedException">The stream is not readable or the image format is not supported.</exception>
     /// <exception cref="InvalidImageContentException">The encoded image contains invalid content.</exception>