From ae549a033861ae08a074fc60a45357af08fc3a7a Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Mon, 14 Aug 2017 02:43:22 +0200 Subject: [PATCH] re-apply DebugSave() changes after merging mutate-api --- .../Image/ImageRotationTests.cs | 6 +-- .../Binarization/BinaryThresholdTest.cs | 4 +- .../Processors/Binarization/DitherTest.cs | 8 ++-- .../Processors/ColorMatrix/BlackWhiteTest.cs | 4 +- .../ColorMatrix/ColorBlindnessTest.cs | 4 +- .../Processors/ColorMatrix/HueTest.cs | 4 +- .../Processors/ColorMatrix/KodachromeTest.cs | 4 +- .../Processors/ColorMatrix/LomographTest.cs | 4 +- .../Processors/ColorMatrix/PolaroidTest.cs | 4 +- .../Processors/ColorMatrix/SaturationTest.cs | 4 +- .../Processors/ColorMatrix/SepiaTest.cs | 4 +- .../Processors/Convolution/BoxBlurTest.cs | 4 +- .../Processors/Convolution/DetectEdgesTest.cs | 4 +- .../Convolution/GaussianBlurTest.cs | 4 +- .../Convolution/GaussianSharpenTest.cs | 4 +- .../Processors/Effects/AlphaTest.cs | 4 +- .../Processors/Effects/BackgroundColorTest.cs | 4 +- .../Processors/Effects/BrightnessTest.cs | 4 +- .../Processors/Effects/ContrastTest.cs | 4 +- .../Processors/Effects/InvertTest.cs | 4 +- .../Processors/Effects/OilPaintTest.cs | 4 +- .../Processors/Effects/PixelateTest.cs | 4 +- .../Processors/Overlays/GlowTest.cs | 8 ++-- .../Processors/Overlays/VignetteTest.cs | 8 ++-- .../Processors/Transforms/AutoOrientTests.cs | 4 +- .../Processors/Transforms/CropTest.cs | 2 +- .../Processors/Transforms/EntropyCropTest.cs | 2 +- .../Processors/Transforms/PadTest.cs | 2 +- .../Processors/Transforms/ResizeTests.cs | 37 +++++++++++++------ .../Processors/Transforms/RotateFlipTests.cs | 2 +- .../Processors/Transforms/RotateTests.cs | 4 +- .../Processors/Transforms/SkewTest.cs | 2 +- 32 files changed, 89 insertions(+), 76 deletions(-) diff --git a/tests/ImageSharp.Tests/Image/ImageRotationTests.cs b/tests/ImageSharp.Tests/Image/ImageRotationTests.cs index 56cec4219..77c25a4d8 100644 --- a/tests/ImageSharp.Tests/Image/ImageRotationTests.cs +++ b/tests/ImageSharp.Tests/Image/ImageRotationTests.cs @@ -45,9 +45,9 @@ namespace ImageSharp.Tests TestFile file = TestFile.Create(TestImages.Bmp.Car); using (Image image = Image.Load(file.FilePath)) { - Size original = image.Bounds.Size; - image.Rotate(angle); - return (original, image.Bounds.Size); + Size original = image.Bounds().Size; + image.Mutate(ctx => ctx.Rotate(angle)); + return (original, image.Bounds().Size); } } } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryThresholdTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryThresholdTest.cs index 209d50661..e0d6ed484 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryThresholdTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryThresholdTest.cs @@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Binarization using (Image image = provider.GetImage()) { image.Mutate(x => x.BinaryThreshold(value)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); } } @@ -42,7 +42,7 @@ namespace ImageSharp.Tests.Processing.Processors.Binarization var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.BinaryThreshold(value, bounds)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Binarization/DitherTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Binarization/DitherTest.cs index edaede58d..6570bc721 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Binarization/DitherTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Binarization/DitherTest.cs @@ -39,7 +39,7 @@ namespace ImageSharp.Tests.Processing.Processors.Binarization using (Image image = provider.GetImage()) { image.Mutate(x => x.Dither(ditherer)); - image.DebugSave(provider, name, Extensions.Bmp); + image.DebugSave(provider, name); } } @@ -54,7 +54,7 @@ namespace ImageSharp.Tests.Processing.Processors.Binarization var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.Dither(ditherer, bounds)); - image.DebugSave(provider, name, Extensions.Bmp); + image.DebugSave(provider, name); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } @@ -68,7 +68,7 @@ namespace ImageSharp.Tests.Processing.Processors.Binarization using (Image image = provider.GetImage()) { image.Mutate(x => x.Dither(diffuser, .5F)); - image.DebugSave(provider, name, Extensions.Bmp); + image.DebugSave(provider, name); } } @@ -83,7 +83,7 @@ namespace ImageSharp.Tests.Processing.Processors.Binarization var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.Dither(diffuser, .5F, bounds)); - image.DebugSave(provider, name, Extensions.Bmp); + image.DebugSave(provider, name); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/BlackWhiteTest.cs b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/BlackWhiteTest.cs index dcc61a629..e572847ad 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/BlackWhiteTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/BlackWhiteTest.cs @@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix using (Image image = provider.GetImage()) { image.Mutate(x => x.BlackWhite()); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); } } @@ -34,7 +34,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.BlackWhite(bounds)); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/ColorBlindnessTest.cs b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/ColorBlindnessTest.cs index 59f389cfd..6a3c341a6 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/ColorBlindnessTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/ColorBlindnessTest.cs @@ -33,7 +33,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix using (Image image = provider.GetImage()) { image.Mutate(x => x.ColorBlindness(colorBlindness)); - image.DebugSave(provider, colorBlindness.ToString(), Extensions.Bmp); + image.DebugSave(provider, colorBlindness.ToString()); } } @@ -48,7 +48,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.ColorBlindness(colorBlindness, bounds)); - image.DebugSave(provider, colorBlindness.ToString(), Extensions.Bmp); + image.DebugSave(provider, colorBlindness.ToString()); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/HueTest.cs b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/HueTest.cs index 30beb61d0..41d0aa8f2 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/HueTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/HueTest.cs @@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix using (Image image = provider.GetImage()) { image.Mutate(x => x.Hue(value)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); } } @@ -41,7 +41,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.Hue(value, bounds)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/KodachromeTest.cs b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/KodachromeTest.cs index be2464d1d..bed4954c8 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/KodachromeTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/KodachromeTest.cs @@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix using (Image image = provider.GetImage()) { image.Mutate(x => x.Kodachrome()); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); } } @@ -34,7 +34,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.Kodachrome(bounds)); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/LomographTest.cs b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/LomographTest.cs index 170999594..8e6d984d8 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/LomographTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/LomographTest.cs @@ -21,7 +21,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix using (Image image = provider.GetImage()) { image.Mutate(x => x.Lomograph()); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); } } @@ -36,7 +36,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.Lomograph(bounds)); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/PolaroidTest.cs b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/PolaroidTest.cs index 367ce04c7..322f6d424 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/PolaroidTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/PolaroidTest.cs @@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix using (Image image = provider.GetImage()) { image.Mutate(x => x.Polaroid()); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); } } @@ -34,7 +34,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.Polaroid(bounds)); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/SaturationTest.cs b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/SaturationTest.cs index ba0cc344e..ced6fceb5 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/SaturationTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/SaturationTest.cs @@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix using (Image image = provider.GetImage()) { image.Mutate(x => x.Saturation(value)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); } } @@ -41,7 +41,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.Saturation(value, bounds)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/SepiaTest.cs b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/SepiaTest.cs index 5879a8bb7..322925c60 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/SepiaTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/ColorMatrix/SepiaTest.cs @@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix using (Image image = provider.GetImage()) { image.Mutate(x => x.Sepia()); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); } } @@ -34,7 +34,7 @@ namespace ImageSharp.Tests.Processing.Processors.ColorMatrix var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.Sepia(bounds)); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/BoxBlurTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/BoxBlurTest.cs index 3daa8c933..cbd32bebd 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/BoxBlurTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/BoxBlurTest.cs @@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Convolution using (Image image = provider.GetImage()) { image.Mutate(x => x.BoxBlur(value)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); } } @@ -41,7 +41,7 @@ namespace ImageSharp.Tests.Processing.Processors.Convolution var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.BoxBlur(value, bounds)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs index 72a3e9023..11c77d711 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs @@ -35,7 +35,7 @@ namespace ImageSharp.Tests.Processing.Processors.Convolution using (Image image = provider.GetImage()) { image.Mutate(x => x.DetectEdges(detector)); - image.DebugSave(provider, detector.ToString(), Extensions.Bmp); + image.DebugSave(provider, detector.ToString()); } } @@ -50,7 +50,7 @@ namespace ImageSharp.Tests.Processing.Processors.Convolution var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.DetectEdges(detector, bounds)); - image.DebugSave(provider, detector.ToString(), Extensions.Bmp); + image.DebugSave(provider, detector.ToString()); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs index 9ccc4e453..6c4efe4d4 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs @@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Convolution using (Image image = provider.GetImage()) { image.Mutate(x => x.GaussianBlur(value)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); } } @@ -41,7 +41,7 @@ namespace ImageSharp.Tests.Processing.Processors.Convolution var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.GaussianBlur(value, bounds)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianSharpenTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianSharpenTest.cs index dab576c2b..9b555c216 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianSharpenTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianSharpenTest.cs @@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Convolution using (Image image = provider.GetImage()) { image.Mutate(x => x.GaussianSharpen(value)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); } } @@ -41,7 +41,7 @@ namespace ImageSharp.Tests.Processing.Processors.Convolution var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.GaussianSharpen(value, bounds)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Effects/AlphaTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Effects/AlphaTest.cs index a7626f386..3b6189d17 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Effects/AlphaTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Effects/AlphaTest.cs @@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects using (Image image = provider.GetImage()) { image.Mutate(x => x.Alpha(value)); - image.DebugSave(provider, value, Extensions.Png); + image.DebugSave(provider, value); } } @@ -41,7 +41,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.Alpha(value, bounds)); - image.DebugSave(provider, value, Extensions.Png); + image.DebugSave(provider, value); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Effects/BackgroundColorTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Effects/BackgroundColorTest.cs index 70c2844de..286248e96 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Effects/BackgroundColorTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Effects/BackgroundColorTest.cs @@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects using (Image image = provider.GetImage()) { image.Mutate(x => x.BackgroundColor(NamedColors.HotPink)); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); } } @@ -34,7 +34,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.BackgroundColor(NamedColors.HotPink, bounds)); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Effects/BrightnessTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Effects/BrightnessTest.cs index 57b7cd8d9..08a46a9c4 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Effects/BrightnessTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Effects/BrightnessTest.cs @@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects using (Image image = provider.GetImage()) { image.Mutate(x => x.Brightness(value)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); } } @@ -41,7 +41,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.Brightness(value, bounds)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); ; } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Effects/ContrastTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Effects/ContrastTest.cs index a5423ba93..3339414d4 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Effects/ContrastTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Effects/ContrastTest.cs @@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects using (Image image = provider.GetImage()) { image.Mutate(x => x.Contrast(value)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); } } @@ -41,7 +41,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.Contrast(value, bounds)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Effects/InvertTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Effects/InvertTest.cs index 2816cb925..f146c5ba3 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Effects/InvertTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Effects/InvertTest.cs @@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects using (Image image = provider.GetImage()) { image.Mutate(x => x.Invert()); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); } } @@ -34,7 +34,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.Invert(bounds)); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Effects/OilPaintTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Effects/OilPaintTest.cs index 0a26cee69..b2b274831 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Effects/OilPaintTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Effects/OilPaintTest.cs @@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects using (Image image = provider.GetImage()) { image.Mutate(x => x.OilPaint(levels, brushSize)); - image.DebugSave(provider, string.Join("-", levels, brushSize), Extensions.Bmp); + image.DebugSave(provider, string.Join("-", levels, brushSize)); } } @@ -41,7 +41,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.OilPaint(levels, brushSize, bounds)); - image.DebugSave(provider, string.Join("-", levels, brushSize), Extensions.Bmp); + image.DebugSave(provider, string.Join("-", levels, brushSize)); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds, 0.001F); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Effects/PixelateTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Effects/PixelateTest.cs index 92703ca07..34f26a1e1 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Effects/PixelateTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Effects/PixelateTest.cs @@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects using (Image image = provider.GetImage()) { image.Mutate(x => x.Pixelate(value)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); // Test the neigbouring pixels for (int y = 0; y < image.Height; y += value) @@ -57,7 +57,7 @@ namespace ImageSharp.Tests.Processing.Processors.Effects var bounds = new Rectangle(image.Width / 4, image.Height / 4, image.Width / 2, image.Height / 2); image.Mutate(x => x.Pixelate(value, bounds)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); for (int y = 0; y < image.Height; y++) { diff --git a/tests/ImageSharp.Tests/Processing/Processors/Overlays/GlowTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Overlays/GlowTest.cs index 3f69ba148..5c0316392 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Overlays/GlowTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Overlays/GlowTest.cs @@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.Overlays using (Image image = provider.GetImage()) { image.Mutate(x => x.Glow()); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); } } @@ -31,7 +31,7 @@ namespace ImageSharp.Tests.Processing.Processors.Overlays using (Image image = provider.GetImage()) { image.Mutate(x => x.Glow(NamedColors.Orange)); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); } } @@ -43,7 +43,7 @@ namespace ImageSharp.Tests.Processing.Processors.Overlays using (Image image = provider.GetImage()) { image.Mutate(x => x.Glow(image.Width / 4F)); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); } } @@ -58,7 +58,7 @@ namespace ImageSharp.Tests.Processing.Processors.Overlays var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.Glow(bounds)); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Overlays/VignetteTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Overlays/VignetteTest.cs index c65b254c0..5d0f593e1 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Overlays/VignetteTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Overlays/VignetteTest.cs @@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.Overlays using (Image image = provider.GetImage()) { image.Mutate(x => x.Vignette()); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); } } @@ -31,7 +31,7 @@ namespace ImageSharp.Tests.Processing.Processors.Overlays using (Image image = provider.GetImage()) { image.Mutate(x => x.Vignette(NamedColors.Orange)); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); } } @@ -43,7 +43,7 @@ namespace ImageSharp.Tests.Processing.Processors.Overlays using (Image image = provider.GetImage()) { image.Mutate(x => x.Vignette(image.Width / 4F, image.Height / 4F)); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); } } @@ -58,7 +58,7 @@ namespace ImageSharp.Tests.Processing.Processors.Overlays var bounds = new Rectangle(10, 10, image.Width / 2, image.Height / 2); image.Mutate(x => x.Vignette(bounds)); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); ImageComparer.EnsureProcessorChangesAreConstrained(source, image, bounds); } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs index 7ab49bc41..df3b77df9 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs @@ -50,10 +50,10 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms image.MetaData.ExifProfile.SetValue(ExifTag.Orientation, orientation); image.Mutate(x => x.RotateFlip(rotateType, flipType)); - image.DebugSave(provider, string.Join("_", rotateType, flipType, orientation, "1_before"), Extensions.Bmp); + image.DebugSave(provider, string.Join("_", rotateType, flipType, orientation, "1_before")); image.Mutate(x => x.AutoOrient()); - image.DebugSave(provider, string.Join("_", rotateType, flipType, orientation, "2_after"), Extensions.Bmp); + image.DebugSave(provider, string.Join("_", rotateType, flipType, orientation, "2_after")); } } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs index 951fdee5e..459cdd7cc 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs @@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms using (Image image = provider.GetImage()) { image.Mutate(x => x.Crop(image.Width / 2, image.Height / 2)); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); } } } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/EntropyCropTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/EntropyCropTest.cs index 910925e8f..673ada24c 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/EntropyCropTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/EntropyCropTest.cs @@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms using (Image image = provider.GetImage()) { image.Mutate(x => x.EntropyCrop(value)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); } } } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/PadTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/PadTest.cs index 9a0964538..6ed299b79 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/PadTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/PadTest.cs @@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms using (Image image = provider.GetImage()) { image.Mutate(x => x.Pad(image.Width + 50, image.Height + 50)); - image.DebugSave(provider, null, Extensions.Bmp); + image.DebugSave(provider); // Check pixels are empty for (int y = 0; y < 25; y++) diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs index 813767edc..db8063ba3 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs @@ -12,7 +12,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms public class ResizeTests : FileTestBase { - public static readonly string[] ResizeFiles = { TestImages.Jpeg.Baseline.Calliphora }; + public static readonly string[] ResizeFiles = { TestImages.Png.CalliphoraPartial }; public static readonly TheoryData ReSamplers = new TheoryData @@ -33,6 +33,19 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms }; [Theory] + [WithFile(TestImages.Gif.Giphy, DefaultPixelType)] + public void ResizeShouldApplyToAllFrames(TestImageProvider provider) + where TPixel : struct, IPixel + { + using (Image image = provider.GetImage()) + { + image.Mutate(x => x.Resize(image.Width / 2, image.Height / 2, true)); + image.DebugSave(provider, extension: Extensions.Gif); + } + } + + [Theory] + [WithTestPatternImages(nameof(ReSamplers), 100, 100, DefaultPixelType)] [WithFileCollection(nameof(ResizeFiles), nameof(ReSamplers), DefaultPixelType)] public void ImageShouldResize(TestImageProvider provider, string name, IResampler sampler) where TPixel : struct, IPixel @@ -40,7 +53,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms using (Image image = provider.GetImage()) { image.Mutate(x => x.Resize(image.Width / 2, image.Height / 2, sampler, true)); - image.DebugSave(provider, name, Extensions.Bmp); + image.DebugSave(provider, name); } } @@ -55,7 +68,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms var destRectangle = new Rectangle(image.Width / 4, image.Height / 4, image.Width / 2, image.Height / 2); image.Mutate(x => x.Resize(image.Width, image.Height, sampler, sourceRectangle, destRectangle, false)); - image.DebugSave(provider, name, Extensions.Bmp); + image.DebugSave(provider, name); } } @@ -67,7 +80,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms using (Image image = provider.GetImage()) { image.Mutate(x => x.Resize(image.Width / 3, 0, sampler, false)); - image.DebugSave(provider, name, Extensions.Bmp); + image.DebugSave(provider, name); } } @@ -79,7 +92,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms using (Image image = provider.GetImage()) { image.Mutate(x => x.Resize(0, image.Height / 3, sampler, false)); - image.DebugSave(provider, name, Extensions.Bmp); + image.DebugSave(provider, name); } } @@ -97,7 +110,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms }; image.Mutate(x => x.Resize(options)); - image.DebugSave(provider, name, Extensions.Bmp); + image.DebugSave(provider, name); } } @@ -115,7 +128,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms }; image.Mutate(x => x.Resize(options)); - image.DebugSave(provider, name, Extensions.Bmp); + image.DebugSave(provider, name); } } @@ -134,7 +147,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms }; image.Mutate(x => x.Resize(options)); - image.DebugSave(provider, name, Extensions.Bmp); + image.DebugSave(provider, name); } } @@ -153,7 +166,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms }; image.Mutate(x => x.Resize(options)); - image.DebugSave(provider, name, Extensions.Bmp); + image.DebugSave(provider, name); } } @@ -172,7 +185,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms }; image.Mutate(x => x.Resize(options)); - image.DebugSave(provider, name, Extensions.Bmp); + image.DebugSave(provider, name); } } @@ -191,7 +204,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms }; image.Mutate(x => x.Resize(options)); - image.DebugSave(provider, name, Extensions.Bmp); + image.DebugSave(provider, name); } } @@ -210,7 +223,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms }; image.Mutate(x => x.Resize(options)); - image.DebugSave(provider, name, Extensions.Bmp); + image.DebugSave(provider, name); } } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateFlipTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateFlipTests.cs index b0cafd114..b6f6a4520 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateFlipTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateFlipTests.cs @@ -32,7 +32,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms using (Image image = provider.GetImage()) { image.Mutate(x => x.RotateFlip(rotateType, flipType)); - image.DebugSave(provider, string.Join("_", rotateType, flipType), Extensions.Bmp); + image.DebugSave(provider, string.Join("_", rotateType, flipType)); } } } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs index 74afd0240..7fc864cac 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs @@ -36,7 +36,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms using (Image image = provider.GetImage()) { image.Mutate(x => x.Rotate(value)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); } } @@ -48,7 +48,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms using (Image image = provider.GetImage()) { image.Mutate(x => x.Rotate(value)); - image.DebugSave(provider, value, Extensions.Bmp); + image.DebugSave(provider, value); } } } diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/SkewTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/SkewTest.cs index 64f4d4905..0088975a6 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/SkewTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/SkewTest.cs @@ -26,7 +26,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms using (Image image = provider.GetImage()) { image.Mutate(i => i.Skew(x, y)); - image.DebugSave(provider, string.Join("_", x, y), Extensions.Bmp); + image.DebugSave(provider, string.Join("_", x, y)); } } }