Fix conflict

Former-commit-id: ed4b24a703a970a29195943a7e627adc00f3c721
Former-commit-id: 7c3b0df0cee361a22014db5905748411b7a0a90f
Former-commit-id: a7c286aefda4abfac0733d1c97bc2d46331fd4cc

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");
+                }
+            }
+        }
     }
 }