Fix conflict

Former-commit-id: ca7b7d4f7443587fe3b20ea0232e88e65e0b6a63
Former-commit-id: a4e53e5d0dc9b47138b532f6d6aad259d465fbb7
Former-commit-id: 64040f11b473a5669d275a5c7681816ea5986b48

tests/ImageProcessor.Tests/Filters/FilterTests.cs

@@ -6,6 +6,7 @@ namespace ImageProcessor.Tests.Filters
     using System.IO;
 
     using ImageProcessor.Filters;
+    using ImageProcessor.Samplers;
 
     using Xunit;
 
@@ -54,5 +55,30 @@ namespace ImageProcessor.Tests.Filters
                 }
             }
         }
+
+        [Fact]
+        public void ResizeImage()
+        {
+            if (!Directory.Exists("Resized"))
+            {
+                Directory.CreateDirectory("Resized");
+            }
+
+            foreach (string file in Files)
+            {
+                using (FileStream stream = File.OpenRead(file))
+                {
+                    Stopwatch watch = Stopwatch.StartNew();
+                    Image image = new Image(stream);
+                    string filename = Path.GetFileName(file);
+                    using (FileStream output = File.OpenWrite($"Resized/{ Path.GetFileName(filename) }"))
+                    {
+                        image.Resize(400, 400).Save(output);
+                    }
+
+                    Trace.WriteLine($"{ filename }: { watch.ElapsedMilliseconds}ms");
+                }
+            }
+        }
     }
 }