Merge pull request #2717 from SixLabors/backport/v2-clear-buffers

V2 - Clear Pixel Buffers on Decode.
SixLabors · Apr 10, 2024 · 8f0b4d3 · 8f0b4d3
2 parents a78ce27 + c122185
commit 8f0b4d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/SpectralConverter{TPixel}.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/SpectralConverter{TPixel}.cs
@@ -116,7 +116,8 @@ public override void InjectFrameData(JpegFrame frame, IRawJpegData jpegData)
             this.pixelBuffer = allocator.Allocate2D<TPixel>(
                 frame.PixelWidth,
                 frame.PixelHeight,
-                this.configuration.PreferContiguousImageBuffers);
+                this.configuration.PreferContiguousImageBuffers,
+                AllocationOptions.Clean);
             this.paddedProxyPixelRow = allocator.Allocate<TPixel>(frame.PixelWidth + 3);
 
             // component processors from spectral to Rgba32
@@ -215,4 +216,4 @@ public void Dispose()
             this.pixelBuffer?.Dispose();
         }
     }
-}
+}
diff --git a/src/ImageSharp/Formats/Tga/TgaDecoderCore.cs b/src/ImageSharp/Formats/Tga/TgaDecoderCore.cs
@@ -97,7 +97,7 @@ public Image<TPixel> Decode<TPixel>(BufferedReadStream stream, CancellationToken
                     throw new UnknownImageFormatException("Width or height cannot be 0");
                 }
 
-                var image = Image.CreateUninitialized<TPixel>(this.Configuration, this.fileHeader.Width, this.fileHeader.Height, this.metadata);
+                Image<TPixel> image = new(this.Configuration, this.fileHeader.Width, this.fileHeader.Height, this.metadata);
                 Buffer2D<TPixel> pixels = image.GetRootFramePixelBuffer();
 
                 if (this.fileHeader.ColorMapType == 1)