Browse Source

Merge branch 'main' into sn/promote-pixeltype

pull/2601/head
James Jackson-South 2 years ago
committed by GitHub
parent
commit
07c8f7a154
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      src/ImageSharp/Formats/Png/Filters/PaethFilter.cs
  2. 2
      src/ImageSharp/Formats/Webp/WebpFormat.cs
  3. 3
      tests/ImageSharp.Tests/Formats/Png/PngDecoderFilterTests.cs

6
src/ImageSharp/Formats/Png/Filters/PaethFilter.cs

@ -35,9 +35,9 @@ internal static class PaethFilter
// row: a d
// The Paeth function predicts d to be whichever of a, b, or c is nearest to
// p = a + b - c.
if (Sse2.IsSupported && bytesPerPixel is 4)
if (Ssse3.IsSupported && bytesPerPixel is 4)
{
DecodeSse3(scanline, previousScanline);
DecodeSsse3(scanline, previousScanline);
}
else if (AdvSimd.Arm64.IsSupported && bytesPerPixel is 4)
{
@ -50,7 +50,7 @@ internal static class PaethFilter
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static void DecodeSse3(Span<byte> scanline, Span<byte> previousScanline)
private static void DecodeSsse3(Span<byte> scanline, Span<byte> previousScanline)
{
ref byte scanBaseRef = ref MemoryMarshal.GetReference(scanline);
ref byte prevBaseRef = ref MemoryMarshal.GetReference(previousScanline);

2
src/ImageSharp/Formats/Webp/WebpFormat.cs

@ -18,7 +18,7 @@ public sealed class WebpFormat : IImageFormat<WebpMetadata, WebpFrameMetadata>
public static WebpFormat Instance { get; } = new WebpFormat();
/// <inheritdoc/>
public string Name => "Webp";
public string Name => "WEBP";
/// <inheritdoc/>
public string DefaultMimeType => "image/webp";

3
tests/ImageSharp.Tests/Formats/Png/PngDecoderFilterTests.cs

@ -170,6 +170,9 @@ public class PngDecoderFilterTests
[Fact]
public void PaethFilter_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPaethFilterTest, HwIntrinsics.AllowAll);
[Fact]
public void PaethFilter_WithoutSsse3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPaethFilterTest, HwIntrinsics.DisableSSSE3);
[Fact]
public void PaethFilter_WithoutHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPaethFilterTest, HwIntrinsics.DisableHWIntrinsic);
}

Loading…
Cancel
Save