Merge branch 'main' into smash_bug

SixLabors · Mar 24, 2023 · ca21b6d · ca21b6d
2 parents b694956 + 302a23f
commit ca21b6d
Showing 1 changed file with 41 additions and 33 deletions.
diff --git a/src/ImageSharp/Formats/Webp/Lossy/Vp8Encoder.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8Encoder.cs
@@ -345,29 +345,6 @@ public void Encode<TPixel>(Image<TPixel> image, Stream stream)
         int expectedSize = this.Mbw * this.Mbh * averageBytesPerMacroBlock;
         this.bitWriter = new Vp8BitWriter(expectedSize, this);
 
-        // Extract and encode alpha channel data, if present.
-        int alphaDataSize = 0;
-        bool alphaCompressionSucceeded = false;
-        Span<byte> alphaData = Span<byte>.Empty;
-        if (hasAlpha)
-        {
-            // TODO: This can potentially run in an separate task.
-            using IMemoryOwner<byte> encodedAlphaData = AlphaEncoder.EncodeAlpha(
-                image,
-                this.configuration,
-                this.memoryAllocator,
-                this.skipMetadata,
-                this.alphaCompression,
-                out alphaDataSize);
-
-            alphaData = encodedAlphaData.GetSpan();
-            if (alphaDataSize < pixelCount)
-            {
-                // Only use compressed data, if the compressed data is actually smaller then the uncompressed data.
-                alphaCompressionSucceeded = true;
-            }
-        }
-
         // Stats-collection loop.
         this.StatLoop(width, height, yStride, uvStride);
         it.Init();
@@ -405,16 +382,47 @@ public void Encode<TPixel>(Image<TPixel> image, Stream stream)
         ExifProfile exifProfile = this.skipMetadata ? null : metadata.ExifProfile;
         XmpProfile xmpProfile = this.skipMetadata ? null : metadata.XmpProfile;
 
-        this.bitWriter.WriteEncodedImageToStream(
-            stream,
-            exifProfile,
-            xmpProfile,
-            metadata.IccProfile,
-            (uint)width,
-            (uint)height,
-            hasAlpha,
-            alphaData[..alphaDataSize],
-            this.alphaCompression && alphaCompressionSucceeded);
+        // Extract and encode alpha channel data, if present.
+        int alphaDataSize = 0;
+        bool alphaCompressionSucceeded = false;
+        Span<byte> alphaData = Span<byte>.Empty;
+        IMemoryOwner<byte> encodedAlphaData = null;
+        try
+        {
+            if (hasAlpha)
+            {
+                // TODO: This can potentially run in an separate task.
+                encodedAlphaData = AlphaEncoder.EncodeAlpha(
+                    image,
+                    this.configuration,
+                    this.memoryAllocator,
+                    this.skipMetadata,
+                    this.alphaCompression,
+                    out alphaDataSize);
+
+                alphaData = encodedAlphaData.GetSpan();
+                if (alphaDataSize < pixelCount)
+                {
+                    // Only use compressed data, if the compressed data is actually smaller then the uncompressed data.
+                    alphaCompressionSucceeded = true;
+                }
+            }
+
+            this.bitWriter.WriteEncodedImageToStream(
+                stream,
+                exifProfile,
+                xmpProfile,
+                metadata.IccProfile,
+                (uint)width,
+                (uint)height,
+                hasAlpha,
+                alphaData[..alphaDataSize],
+                this.alphaCompression && alphaCompressionSucceeded);
+        }
+        finally
+        {
+            encodedAlphaData?.Dispose();
+        }
     }
 
     /// <inheritdoc/>