diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets index 5ca7d2b937..238046d759 100644 --- a/tests/Directory.Build.targets +++ b/tests/Directory.Build.targets @@ -30,7 +30,6 @@ - diff --git a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj index 30fbbbda98..248b14a9d6 100644 --- a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj +++ b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj @@ -41,10 +41,10 @@ - - + diff --git a/tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressBenchmarks.cs b/tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressBenchmarks.cs index add5a72ff9..dc2f49b1eb 100644 --- a/tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressBenchmarks.cs +++ b/tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressBenchmarks.cs @@ -2,9 +2,6 @@ // Licensed under the Apache License, Version 2.0. using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using BenchmarkDotNet.Attributes; namespace SixLabors.ImageSharp.Benchmarks.LoadResizeSave @@ -49,18 +46,10 @@ namespace SixLabors.ImageSharp.Benchmarks.LoadResizeSave [ArgumentsSource(nameof(ParallelismValues))] public void Magick(int maxDegreeOfParallelism) => this.ForEachImage(this.runner.MagickResize, maxDegreeOfParallelism); - [Benchmark] - [ArgumentsSource(nameof(ParallelismValues))] - public void FreeImage(int maxDegreeOfParallelism) => this.ForEachImage(this.runner.FreeImageResize, maxDegreeOfParallelism); - [Benchmark] [ArgumentsSource(nameof(ParallelismValues))] public void MagicScaler(int maxDegreeOfParallelism) => this.ForEachImage(this.runner.MagicScalerResize, maxDegreeOfParallelism); - [Benchmark] - [ArgumentsSource(nameof(ParallelismValues))] - public void SkiaCanvas(int maxDegreeOfParallelism) => this.ForEachImage(this.runner.SkiaCanvasResize, maxDegreeOfParallelism); - [Benchmark] [ArgumentsSource(nameof(ParallelismValues))] public void SkiaBitmap(int maxDegreeOfParallelism) => this.ForEachImage(this.runner.SkiaBitmapResize, maxDegreeOfParallelism); diff --git a/tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressRunner.cs b/tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressRunner.cs index bb9b68d65a..bd3a8e62d7 100644 --- a/tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressRunner.cs +++ b/tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressRunner.cs @@ -9,7 +9,6 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; -using FreeImageAPI; using ImageMagick; using PhotoSauce.MagicScaler; using SixLabors.ImageSharp.Formats.Jpeg; @@ -31,7 +30,6 @@ namespace SixLabors.ImageSharp.Benchmarks.LoadResizeSave private const string SystemDrawing = nameof(SystemDrawing); private const string MagickNET = nameof(MagickNET); private const string NetVips = nameof(NetVips); - private const string FreeImage = nameof(FreeImage); private const string MagicScaler = nameof(MagicScaler); private const string SkiaSharpCanvas = nameof(SkiaSharpCanvas); private const string SkiaSharpBitmap = nameof(SkiaSharpBitmap); @@ -167,22 +165,6 @@ namespace SixLabors.ImageSharp.Benchmarks.LoadResizeSave image.Write(this.OutputPath(input, MagickNET)); } - public void FreeImageResize(string input) - { - using var original = FreeImageBitmap.FromFile(input); - this.IncreaseTotalMegapixels(original.Width, original.Height); - - (int width, int height) scaled = this.ScaledSize(original.Width, original.Height, ThumbnailSize); - var resized = new FreeImageBitmap(original, scaled.width, scaled.height); - - // JPEG_QUALITYGOOD is 75 JPEG. - // JPEG_BASELINE strips metadata (EXIF, etc.) - resized.Save( - this.OutputPath(input, FreeImage), - FREE_IMAGE_FORMAT.FIF_JPEG, - FREE_IMAGE_SAVE_FLAGS.JPEG_QUALITYGOOD | FREE_IMAGE_SAVE_FLAGS.JPEG_BASELINE); - } - public void MagicScalerResize(string input) { var settings = new ProcessImageSettings() diff --git a/tests/ImageSharp.Tests.ProfilingSandbox/LoadResizeSaveParallelMemoryStress.cs b/tests/ImageSharp.Tests.ProfilingSandbox/LoadResizeSaveParallelMemoryStress.cs index fdf6860806..fac04e94d9 100644 --- a/tests/ImageSharp.Tests.ProfilingSandbox/LoadResizeSaveParallelMemoryStress.cs +++ b/tests/ImageSharp.Tests.ProfilingSandbox/LoadResizeSaveParallelMemoryStress.cs @@ -32,7 +32,6 @@ namespace SixLabors.ImageSharp.Tests.ProfilingSandbox 4. SkiaSharp 5. NetVips 6. ImageMagick -7. FreeImage "); ConsoleKey key = Console.ReadKey().Key; @@ -63,7 +62,7 @@ namespace SixLabors.ImageSharp.Tests.ProfilingSandbox lrs.MagicScalerBenchmarkParallel(); break; case ConsoleKey.D4: - lrs.SkiaCanvasBenchmarkParallel(); + lrs.SkiaBitmapBenchmarkParallel(); break; case ConsoleKey.D5: lrs.NetVipsBenchmarkParallel(); @@ -71,9 +70,6 @@ namespace SixLabors.ImageSharp.Tests.ProfilingSandbox case ConsoleKey.D6: lrs.MagickBenchmarkParallel(); break; - case ConsoleKey.D7: - lrs.FreeImageBenchmarkParallel(); - break; } timer.Stop(); @@ -127,12 +123,8 @@ namespace SixLabors.ImageSharp.Tests.ProfilingSandbox private void MagickBenchmarkParallel() => this.ForEachImage(this.benchmarks.MagickResize); - private void FreeImageBenchmarkParallel() => this.ForEachImage(this.benchmarks.FreeImageResize); - private void MagicScalerBenchmarkParallel() => this.ForEachImage(this.benchmarks.MagicScalerResize); - private void SkiaCanvasBenchmarkParallel() => this.ForEachImage(this.benchmarks.SkiaCanvasResize); - private void SkiaBitmapBenchmarkParallel() => this.ForEachImage(this.benchmarks.SkiaBitmapResize); private void NetVipsBenchmarkParallel() => this.ForEachImage(this.benchmarks.NetVipsResize);