From 48af792c144b6c781435f823008635c10b0d313a Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Sat, 10 Aug 2019 18:33:10 +1000 Subject: [PATCH] use params where possible (#961) * use params where possible * use params --- tests/ImageSharp.Benchmarks/Drawing/DrawBeziers.cs | 14 ++++++-------- tests/ImageSharp.Benchmarks/Drawing/DrawLines.cs | 12 +++++------- tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs | 12 +++++------- tests/ImageSharp.Benchmarks/Drawing/FillPolygon.cs | 10 ++++------ .../ImageSharp.Benchmarks/Drawing/FillRectangle.cs | 11 +++++------ .../Drawing/FillRegionProcessorTests.cs | 5 ++--- tests/ImageSharp.Tests/Issues/Issue412.cs | 10 ++-------- 7 files changed, 29 insertions(+), 45 deletions(-) diff --git a/tests/ImageSharp.Benchmarks/Drawing/DrawBeziers.cs b/tests/ImageSharp.Benchmarks/Drawing/DrawBeziers.cs index 8999afaeda..8f4a7dfcb7 100644 --- a/tests/ImageSharp.Benchmarks/Drawing/DrawBeziers.cs +++ b/tests/ImageSharp.Benchmarks/Drawing/DrawBeziers.cs @@ -1,4 +1,4 @@ -// Copyright (c) Six Labors and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. using System.Drawing; @@ -48,12 +48,10 @@ namespace SixLabors.ImageSharp.Benchmarks image.Mutate(x => x.DrawBeziers( Rgba32.HotPink, 10, - new SixLabors.Primitives.PointF[] { - new Vector2(10, 500), - new Vector2(30, 10), - new Vector2(240, 30), - new Vector2(300, 500) - })); + new Vector2(10, 500), + new Vector2(30, 10), + new Vector2(240, 30), + new Vector2(300, 500))); using (var stream = new MemoryStream()) { @@ -62,4 +60,4 @@ namespace SixLabors.ImageSharp.Benchmarks } } } -} \ No newline at end of file +} diff --git a/tests/ImageSharp.Benchmarks/Drawing/DrawLines.cs b/tests/ImageSharp.Benchmarks/Drawing/DrawLines.cs index 408e87f9ee..43b7672c47 100644 --- a/tests/ImageSharp.Benchmarks/Drawing/DrawLines.cs +++ b/tests/ImageSharp.Benchmarks/Drawing/DrawLines.cs @@ -1,4 +1,4 @@ -// Copyright (c) Six Labors and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. using System.Drawing; @@ -48,11 +48,9 @@ namespace SixLabors.ImageSharp.Benchmarks image.Mutate(x => x.DrawLines( Rgba32.HotPink, 10, - new SixLabors.Primitives.PointF[] { - new Vector2(10, 10), - new Vector2(550, 50), - new Vector2(200, 400) - })); + new Vector2(10, 10), + new Vector2(550, 50), + new Vector2(200, 400))); using (var stream = new MemoryStream()) { @@ -61,4 +59,4 @@ namespace SixLabors.ImageSharp.Benchmarks } } } -} \ No newline at end of file +} diff --git a/tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs b/tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs index 2b4cff8cbe..f20469b63d 100644 --- a/tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs +++ b/tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs @@ -1,4 +1,4 @@ -// Copyright (c) Six Labors and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. using System.Drawing; @@ -46,11 +46,9 @@ namespace SixLabors.ImageSharp.Benchmarks image.Mutate(x => x.DrawPolygon( Rgba32.HotPink, 10, - new SixLabors.Primitives.PointF[] { - new Vector2(10, 10), - new Vector2(550, 50), - new Vector2(200, 400) - })); + new Vector2(10, 10), + new Vector2(550, 50), + new Vector2(200, 400))); using (var ms = new MemoryStream()) { @@ -59,4 +57,4 @@ namespace SixLabors.ImageSharp.Benchmarks } } } -} \ No newline at end of file +} diff --git a/tests/ImageSharp.Benchmarks/Drawing/FillPolygon.cs b/tests/ImageSharp.Benchmarks/Drawing/FillPolygon.cs index a81d5dd9cc..f33df7ec62 100644 --- a/tests/ImageSharp.Benchmarks/Drawing/FillPolygon.cs +++ b/tests/ImageSharp.Benchmarks/Drawing/FillPolygon.cs @@ -1,4 +1,4 @@ -// Copyright (c) Six Labors and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. using System.Drawing; @@ -54,11 +54,9 @@ namespace SixLabors.ImageSharp.Benchmarks { image.Mutate(x => x.FillPolygon( Rgba32.HotPink, - new SixLabors.Primitives.PointF[] { - new Vector2(10, 10), - new Vector2(550, 50), - new Vector2(200, 400) - })); + new Vector2(10, 10), + new Vector2(550, 50), + new Vector2(200, 400))); using (var stream = new MemoryStream()) { diff --git a/tests/ImageSharp.Benchmarks/Drawing/FillRectangle.cs b/tests/ImageSharp.Benchmarks/Drawing/FillRectangle.cs index 7dc90a9cc9..531c540da7 100644 --- a/tests/ImageSharp.Benchmarks/Drawing/FillRectangle.cs +++ b/tests/ImageSharp.Benchmarks/Drawing/FillRectangle.cs @@ -1,4 +1,4 @@ -// Copyright (c) Six Labors and contributors. +// Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. using System.Drawing; @@ -47,11 +47,10 @@ namespace SixLabors.ImageSharp.Benchmarks { image.Mutate(x => x.FillPolygon( Rgba32.HotPink, - new SixLabors.Primitives.PointF[] { - new Vector2(10, 10), - new Vector2(200, 10), - new Vector2(200, 150), - new Vector2(10, 150) })); + new Vector2(10, 10), + new Vector2(200, 10), + new Vector2(200, 150), + new Vector2(10, 150))); return new CoreSize(image.Width, image.Height); } diff --git a/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs b/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs index 0bed331138..c23ec98745 100644 --- a/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs +++ b/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs @@ -62,10 +62,9 @@ namespace SixLabors.ImageSharp.Tests.Drawing using (var img = new Image(10, 10)) { - img.Mutate(x => x.DrawLines(new Pen(Rgba32.Black, 10), new SixLabors.Primitives.PointF[] { + img.Mutate(x => x.DrawLines(new Pen(Rgba32.Black, 10), new Vector2(-10, 5), - new Vector2(20, 5), - })); + new Vector2(20, 5))); } } diff --git a/tests/ImageSharp.Tests/Issues/Issue412.cs b/tests/ImageSharp.Tests/Issues/Issue412.cs index 7b2cfd81c6..5a590018e5 100644 --- a/tests/ImageSharp.Tests/Issues/Issue412.cs +++ b/tests/ImageSharp.Tests/Issues/Issue412.cs @@ -23,21 +23,15 @@ namespace SixLabors.ImageSharp.Tests.Issues new GraphicsOptions(false), Color.Black, 1, - new[] - { new PointF(i, 0.1066f), - new PointF(i, 10.1066f) - }); + new PointF(i, 10.1066f)); context.DrawLines( new GraphicsOptions(false), Color.Red, 1, - new[] - { new PointF(i, 15.1066f), - new PointF(i, 25.1066f) - }); + new PointF(i, 25.1066f)); } });