tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

use params where possible (#961) 

* use params where possible

* use params
af/merge-core
Simon Cropp 7 years ago
committed by James Jackson-South
parent
2c04d6b036
commit
48af792c14
7 changed files with 29 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      tests/ImageSharp.Benchmarks/Drawing/DrawBeziers.cs
  2. 12
      tests/ImageSharp.Benchmarks/Drawing/DrawLines.cs
  3. 12
      tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs
  4. 10
      tests/ImageSharp.Benchmarks/Drawing/FillPolygon.cs
  5. 11
      tests/ImageSharp.Benchmarks/Drawing/FillRectangle.cs
  6. 5
      tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs
  7. 10
      tests/ImageSharp.Tests/Issues/Issue412.cs

14
tests/ImageSharp.Benchmarks/Drawing/DrawBeziers.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Six Labors and contributors. // Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
using System.Drawing; using System.Drawing;
@ -48,12 +48,10 @@ namespace SixLabors.ImageSharp.Benchmarks
image.Mutate(x => x.DrawBeziers( image.Mutate(x => x.DrawBeziers(
Rgba32.HotPink, Rgba32.HotPink,
10, 10,
new SixLabors.Primitives.PointF[] { new Vector2(10, 500),
new Vector2(10, 500), new Vector2(30, 10),
new Vector2(30, 10), new Vector2(240, 30),
new Vector2(240, 30), new Vector2(300, 500)));
new Vector2(300, 500)
}));
using (var stream = new MemoryStream()) using (var stream = new MemoryStream())
{ {
@ -62,4 +60,4 @@ namespace SixLabors.ImageSharp.Benchmarks
} }
} }
} }
} }

12
tests/ImageSharp.Benchmarks/Drawing/DrawLines.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Six Labors and contributors. // Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
using System.Drawing; using System.Drawing;
@ -48,11 +48,9 @@ namespace SixLabors.ImageSharp.Benchmarks
image.Mutate(x => x.DrawLines( image.Mutate(x => x.DrawLines(
Rgba32.HotPink, Rgba32.HotPink,
10, 10,
new SixLabors.Primitives.PointF[] { new Vector2(10, 10),
new Vector2(10, 10), new Vector2(550, 50),
new Vector2(550, 50), new Vector2(200, 400)));
new Vector2(200, 400)
}));
using (var stream = new MemoryStream()) using (var stream = new MemoryStream())
{ {
@ -61,4 +59,4 @@ namespace SixLabors.ImageSharp.Benchmarks
} }
} }
} }
} }

12
tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Six Labors and contributors. // Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
using System.Drawing; using System.Drawing;
@ -46,11 +46,9 @@ namespace SixLabors.ImageSharp.Benchmarks
image.Mutate(x => x.DrawPolygon( image.Mutate(x => x.DrawPolygon(
Rgba32.HotPink, Rgba32.HotPink,
10, 10,
new SixLabors.Primitives.PointF[] { new Vector2(10, 10),
new Vector2(10, 10), new Vector2(550, 50),
new Vector2(550, 50), new Vector2(200, 400)));
new Vector2(200, 400)
}));
using (var ms = new MemoryStream()) using (var ms = new MemoryStream())
{ {
@ -59,4 +57,4 @@ namespace SixLabors.ImageSharp.Benchmarks
} }
} }
} }
} }

10
tests/ImageSharp.Benchmarks/Drawing/FillPolygon.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Six Labors and contributors. // Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
using System.Drawing; using System.Drawing;
@ -54,11 +54,9 @@ namespace SixLabors.ImageSharp.Benchmarks
{ {
image.Mutate(x => x.FillPolygon( image.Mutate(x => x.FillPolygon(
Rgba32.HotPink, Rgba32.HotPink,
new SixLabors.Primitives.PointF[] { new Vector2(10, 10),
new Vector2(10, 10), new Vector2(550, 50),
new Vector2(550, 50), new Vector2(200, 400)));
new Vector2(200, 400)
}));
using (var stream = new MemoryStream()) using (var stream = new MemoryStream())
{ {

11
tests/ImageSharp.Benchmarks/Drawing/FillRectangle.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) Six Labors and contributors. // Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
using System.Drawing; using System.Drawing;
@ -47,11 +47,10 @@ namespace SixLabors.ImageSharp.Benchmarks
{ {
image.Mutate(x => x.FillPolygon( image.Mutate(x => x.FillPolygon(
Rgba32.HotPink, Rgba32.HotPink,
new SixLabors.Primitives.PointF[] { new Vector2(10, 10),
new Vector2(10, 10), new Vector2(200, 10),
new Vector2(200, 10), new Vector2(200, 150),
new Vector2(200, 150), new Vector2(10, 150)));
new Vector2(10, 150) }));
return new CoreSize(image.Width, image.Height); return new CoreSize(image.Width, image.Height);
} }

5
tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs
View File

@ -62,10 +62,9 @@ namespace SixLabors.ImageSharp.Tests.Drawing
using (var img = new Image<Rgba32>(10, 10)) 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(-10, 5),
new Vector2(20, 5), new Vector2(20, 5)));
}));
} }
} }

10
tests/ImageSharp.Tests/Issues/Issue412.cs
View File

@ -23,21 +23,15 @@ namespace SixLabors.ImageSharp.Tests.Issues
new GraphicsOptions(false), new GraphicsOptions(false),
Color.Black, Color.Black,
1, 1,
new[]
{
new PointF(i, 0.1066f), new PointF(i, 0.1066f),
new PointF(i, 10.1066f) new PointF(i, 10.1066f));
});
context.DrawLines( context.DrawLines(
new GraphicsOptions(false), new GraphicsOptions(false),
Color.Red, Color.Red,
1, 1,
new[]
{
new PointF(i, 15.1066f), new PointF(i, 15.1066f),
new PointF(i, 25.1066f) new PointF(i, 25.1066f));
});
} }
}); });

Write Preview
Loading…
Cancel
Save