From c2d874711d376ebb6bc1f022d752232b151fecfd Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Mon, 4 Dec 2017 17:04:06 +1100 Subject: [PATCH] Add new transform draw test --- .../ImageSharp.Tests/Drawing/DrawImageTest.cs | 20 +++++++++++++++++++ .../Processing/Transforms/TransformTests.cs | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs b/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs index 2e3a730fc..6a55d8a56 100644 --- a/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs +++ b/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs @@ -10,6 +10,7 @@ using Xunit; namespace SixLabors.ImageSharp.Tests { using System; + using System.Numerics; public class DrawImageTest : FileTestBase { @@ -45,6 +46,25 @@ namespace SixLabors.ImageSharp.Tests } } + [Theory] + [WithFileCollection(nameof(TestFiles), PixelTypes, PixelBlenderMode.Normal)] + public void ImageShouldDrawTransformedImage(TestImageProvider provider, PixelBlenderMode mode) + where TPixel : struct, IPixel + { + using (Image image = provider.GetImage()) + using (Image blend = Image.Load(TestFile.Create(TestImages.Bmp.Car).Bytes)) + { + Matrix3x2 rotate = Matrix3x2Extensions.CreateRotationDegrees(45F); + Matrix3x2 scale = Matrix3x2Extensions.CreateScale(new SizeF(.25F, .25F)); + + blend.Mutate(x => x.Transform(rotate * scale)); + + var position = new Point((image.Width - blend.Width) / 2, (image.Height - blend.Height) / 2); + image.Mutate(x => x.DrawImage(blend, mode, .75F, new Size(blend.Width, blend.Height), position)); + image.DebugSave(provider, new[] { "Transformed" }); + } + } + [Theory] [WithSolidFilledImages(100, 100, 255, 255, 255, PixelTypes.Rgba32)] public void ImageShouldHandleNegativeLocation(TestImageProvider provider) diff --git a/tests/ImageSharp.Tests/Processing/Transforms/TransformTests.cs b/tests/ImageSharp.Tests/Processing/Transforms/TransformTests.cs index 4562d7de7..8dad6de41 100644 --- a/tests/ImageSharp.Tests/Processing/Transforms/TransformTests.cs +++ b/tests/ImageSharp.Tests/Processing/Transforms/TransformTests.cs @@ -53,7 +53,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms using (Image image = provider.GetImage()) { Matrix3x2 rotate = Matrix3x2Extensions.CreateRotationDegrees(z); - Matrix3x2 scale = Matrix3x2Extensions.CreateScale(new SizeF(2F, 2F)); + Matrix3x2 scale = Matrix3x2Extensions.CreateScale(new SizeF(.5F, .5F)); image.Mutate(i => i.Transform(rotate * scale, sampler)); image.DebugSave(provider, string.Join("_", x, y, resamplerName));