Skip to content

use params where possible #961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 10, 2019
Merged

use params where possible #961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c82210
use params where possible
SimonCropp Aug 8, 2019
d35ea1c
use params
SimonCropp Aug 8, 2019
e6e2da8
Merge branch 'master' into redundantArrayInit
JimBobSquarePants Aug 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions tests/ImageSharp.Benchmarks/Drawing/DrawBeziers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -48,12 +48,10 @@ public void DrawLinesCore()
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())
{
Expand All @@ -62,4 +60,4 @@ public void DrawLinesCore()
}
}
}
}
}
12 changes: 5 additions & 7 deletions tests/ImageSharp.Benchmarks/Drawing/DrawLines.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -48,11 +48,9 @@ public void DrawLinesCore()
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())
{
Expand All @@ -61,4 +59,4 @@ public void DrawLinesCore()
}
}
}
}
}
12 changes: 5 additions & 7 deletions tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -46,11 +46,9 @@ public void DrawPolygonCore()
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())
{
Expand All @@ -59,4 +57,4 @@ public void DrawPolygonCore()
}
}
}
}
}
10 changes: 4 additions & 6 deletions tests/ImageSharp.Benchmarks/Drawing/FillPolygon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -54,11 +54,9 @@ public void DrawSolidPolygonCore()
{
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())
{
Expand Down
11 changes: 5 additions & 6 deletions tests/ImageSharp.Benchmarks/Drawing/FillRectangle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -47,11 +47,10 @@ public CoreSize FillPolygonCore()
{
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);
}
Expand Down
5 changes: 2 additions & 3 deletions tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,9 @@ public void DrawOffCanvas()

using (var img = new Image<Rgba32>(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)));
}
}

Expand Down
10 changes: 2 additions & 8 deletions tests/ImageSharp.Tests/Issues/Issue412.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,15 @@ public void AllPixelsExpectedToBeRedWhenAntialiasedDisabled<TPixel>(TestImagePro
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));
}
});

Expand Down