From 6a43f94ce5ef3b4c1a8c106df744311582fb5e89 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Wed, 1 Jun 2016 01:28:44 +1000 Subject: [PATCH] Moar resize and skew [skip ci] Somebody help me fix skew please. Former-commit-id: 4c22456179078f77a0f523a9b4f6eb3af2da42be Former-commit-id: 3fc9f06730164cffa4d6ca23e43dbd8e81869bf8 Former-commit-id: 357a39fe9c72ae0584e0b05014a6759b2b3af547 --- src/ImageProcessorCore/Common/Helpers/ImageMaths.cs | 10 ++++++---- src/ImageProcessorCore/Samplers/Rotate.cs | 7 +++---- src/ImageProcessorCore/Samplers/Skew.cs | 4 ++-- .../Processors/Samplers/SamplerTests.cs | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/ImageProcessorCore/Common/Helpers/ImageMaths.cs b/src/ImageProcessorCore/Common/Helpers/ImageMaths.cs index 633f7a9922..c85499081f 100644 --- a/src/ImageProcessorCore/Common/Helpers/ImageMaths.cs +++ b/src/ImageProcessorCore/Common/Helpers/ImageMaths.cs @@ -6,6 +6,8 @@ namespace ImageProcessorCore { using System; + using System.Collections.Generic; + using System.Linq; using System.Numerics; /// @@ -145,10 +147,10 @@ namespace ImageProcessorCore Vector2 leftBottom = Vector2.Transform(new Vector2(rectangle.Left, rectangle.Bottom), matrix); Vector2 rightBottom = Vector2.Transform(new Vector2(rectangle.Right, rectangle.Bottom), matrix); - Vector2 min = Vector2.Min(Vector2.Min(leftTop, rightTop), Vector2.Min(leftBottom, rightBottom)); - Vector2 max = Vector2.Max(Vector2.Max(leftTop, rightTop), Vector2.Max(leftBottom, rightBottom)); - - return new Rectangle(0, 0, (int)(max.X - min.X), (int)(max.Y - min.Y)); + Vector2[] allCorners = { leftTop, rightTop, leftBottom, rightBottom }; + float extentX = allCorners.Select(v => v.X).Max() - allCorners.Select(v => v.X).Min(); + float extentY = allCorners.Select(v => v.Y).Max() - allCorners.Select(v => v.Y).Min(); + return new Rectangle(0, 0, (int)extentX, (int)extentY); } /// diff --git a/src/ImageProcessorCore/Samplers/Rotate.cs b/src/ImageProcessorCore/Samplers/Rotate.cs index e8c8237230..edec0f6bd7 100644 --- a/src/ImageProcessorCore/Samplers/Rotate.cs +++ b/src/ImageProcessorCore/Samplers/Rotate.cs @@ -76,8 +76,7 @@ namespace ImageProcessorCore.Samplers ResizeOptions options = new ResizeOptions { Size = new Size(rectangle.Width, rectangle.Height), - Mode = ResizeMode.BoxPad, - Sampler = new NearestNeighborResampler() + Mode = ResizeMode.BoxPad }; // Get the padded bounds and resize the image. @@ -98,8 +97,8 @@ namespace ImageProcessorCore.Samplers protected override void Apply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY) { int height = this.firstPass.Height; - int startX = this.firstPass.Bounds.X; - int endX = this.firstPass.Bounds.Right; + int startX = 0; + int endX = this.firstPass.Width; Point centre = this.Center == Point.Empty ? Rectangle.Center(this.firstPass.Bounds) : this.Center; Matrix3x2 rotation = Point.CreateRotation(centre, -this.angle); diff --git a/src/ImageProcessorCore/Samplers/Skew.cs b/src/ImageProcessorCore/Samplers/Skew.cs index 9248b30168..cef3b92169 100644 --- a/src/ImageProcessorCore/Samplers/Skew.cs +++ b/src/ImageProcessorCore/Samplers/Skew.cs @@ -128,8 +128,8 @@ namespace ImageProcessorCore.Samplers protected override void Apply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY) { int height = this.firstPass.Height; - int startX = this.firstPass.Bounds.X; - int endX = this.firstPass.Bounds.Right; + int startX = 0; + int endX = this.firstPass.Width; Point centre = this.Center == Point.Empty ? Rectangle.Center(this.firstPass.Bounds) : this.Center; Matrix3x2 skew = Point.CreateSkew(centre, -this.angleX, -this.angleY); diff --git a/tests/ImageProcessorCore.Tests/Processors/Samplers/SamplerTests.cs b/tests/ImageProcessorCore.Tests/Processors/Samplers/SamplerTests.cs index 7d57934f0d..f7f503e78e 100644 --- a/tests/ImageProcessorCore.Tests/Processors/Samplers/SamplerTests.cs +++ b/tests/ImageProcessorCore.Tests/Processors/Samplers/SamplerTests.cs @@ -435,7 +435,7 @@ using (Image image = new Image(stream)) using (FileStream output = File.OpenWrite($"TestOutput/Rotate/{filename}")) { - image.Rotate(45, this.ProgressUpdate) + image.Rotate(63, this.ProgressUpdate) .Save(output); }