Browse Source

fix all instances of var

pull/133/head
Scott Williams 9 years ago
parent
commit
e29f3eadd9
  1. 58
      build/Program.cs
  2. 2
      src/ImageSharp.Drawing/Brushes/ImageBrush{TColor}.cs
  3. 2
      src/ImageSharp.Drawing/Brushes/RecolorBrush{TColor}.cs
  4. 22
      src/ImageSharp.Drawing/Pens/Pen{TColor}.cs
  5. 4
      src/ImageSharp/Colors/PackedPixel/Argb.cs
  6. 4
      src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegBlockProcessor.cs
  7. 2
      src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegPixelArea.cs
  8. 4
      src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegScanDecoder.cs
  9. 2
      src/ImageSharp/IO/EndianBinaryWriter.cs
  10. 2
      src/ImageSharp/Image/Image{TColor}.cs
  11. 2
      tests/ImageSharp.Benchmarks/Drawing/DrawBeziers.cs
  12. 2
      tests/ImageSharp.Benchmarks/Drawing/DrawLines.cs
  13. 2
      tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs
  14. 2
      tests/ImageSharp.Benchmarks/Drawing/FillWithPattern.cs
  15. 20
      tests/ImageSharp.Benchmarks/Image/MultiImageBenchmarkBase.cs
  16. 2
      tests/ImageSharp.Tests/Colors/BulkPixelOperationsTests.cs
  17. 34
      tests/ImageSharp.Tests/Colors/ColorConstructorTests.cs
  18. 20
      tests/ImageSharp.Tests/Colors/ColorEqualityTests.cs
  19. 18
      tests/ImageSharp.Tests/Colors/ColorPackingTests.cs
  20. 2
      tests/ImageSharp.Tests/Common/PinnedBufferTests.cs
  21. 2
      tests/ImageSharp.Tests/ConfigurationTests.cs
  22. 4
      tests/ImageSharp.Tests/Drawing/LineComplexPolygonTests.cs
  23. 2
      tests/ImageSharp.Tests/Drawing/SolidComplexPolygonTests.cs
  24. 6
      tests/ImageSharp.Tests/Drawing/SolidPolygonTests.cs
  25. 6
      tests/ImageSharp.Tests/Drawing/Text/GlyphBuilder.cs
  26. 2
      tests/ImageSharp.Tests/Drawing/Text/OutputText.cs
  27. 6
      tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
  28. 4
      tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs
  29. 40
      tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs
  30. 4
      tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
  31. 4
      tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
  32. 4
      tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs
  33. 2
      tests/ImageSharp.Tests/Formats/Jpg/YCbCrImageTests.cs
  34. 6
      tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
  35. 20
      tests/ImageSharp.Tests/Image/ImageTests.cs
  36. 2
      tests/ImageSharp.Tests/MetaData/Profiles/Exif/ExifProfileTests.cs
  37. 2
      tests/ImageSharp.Tests/MetaData/Profiles/Exif/ExifTagDescriptionAttributeTests.cs
  38. 4
      tests/ImageSharp.Tests/Processors/Filters/ResizeTests.cs
  39. 2
      tests/ImageSharp.Tests/TestFile.cs
  40. 2
      tests/ImageSharp.Tests/TestFont.cs
  41. 12
      tests/ImageSharp.Tests/TestUtilities/Attributes/ImageDataAttributeBase.cs
  42. 6
      tests/ImageSharp.Tests/TestUtilities/Attributes/WithFileCollectionAttribute.cs
  43. 16
      tests/ImageSharp.Tests/TestUtilities/Attributes/WithMemberFactoryAttribute.cs
  44. 6
      tests/ImageSharp.Tests/TestUtilities/ImageProviders/FileProvider.cs
  45. 2
      tests/ImageSharp.Tests/TestUtilities/ImageProviders/SolidProvider.cs
  46. 4
      tests/ImageSharp.Tests/TestUtilities/ImagingTestCaseUtility.cs
  47. 10
      tests/ImageSharp.Tests/TestUtilities/TestUtilityExtensions.cs
  48. 20
      tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs
  49. 18
      tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs

58
build/Program.cs

@ -63,21 +63,21 @@ namespace ConsoleApplication
/// <param name="args">The arguments.</param>
public static void Main(string[] args)
{
var resetmode = args.Contains("reset");
bool resetmode = args.Contains("reset");
// Find the project root
var root = Path.GetFullPath(Path.Combine(LibGit2Sharp.Repository.Discover("."), ".."));
string root = Path.GetFullPath(Path.Combine(LibGit2Sharp.Repository.Discover("."), ".."));
// Lets find the repo
var repo = new LibGit2Sharp.Repository(root);
Repository repo = new LibGit2Sharp.Repository(root);
// Lets find all the project.json files in the src folder (don't care about versioning `tests`)
var projectFiles = Directory.EnumerateFiles(Path.Combine(root, "src"), "*.csproj", SearchOption.AllDirectories);
IEnumerable<string> projectFiles = Directory.EnumerateFiles(Path.Combine(root, "src"), "*.csproj", SearchOption.AllDirectories);
ResetProject(projectFiles);
// Open them and convert them to source projects
var projects = projectFiles.Select(x => ProjectRootElement.Open(x, ProjectCollection.GlobalProjectCollection, true))
List<SourceProject> projects = projectFiles.Select(x => ProjectRootElement.Open(x, ProjectCollection.GlobalProjectCollection, true))
.Select(x => new SourceProject(x, repo.Info.WorkingDirectory))
.ToList();
@ -89,7 +89,7 @@ namespace ConsoleApplication
CreateBuildScript(projects, root);
foreach (var p in projects)
foreach (SourceProject p in projects)
{
Console.WriteLine($"{p.Name} {p.FinalVersionNumber}");
}
@ -98,10 +98,10 @@ namespace ConsoleApplication
private static void CreateBuildScript(IEnumerable<SourceProject> projects, string root)
{
var outputDir = Path.GetFullPath(Path.Combine(root, @"artifacts\bin\ImageSharp"));
string outputDir = Path.GetFullPath(Path.Combine(root, @"artifacts\bin\ImageSharp"));
var sb = new StringBuilder();
foreach (var p in projects)
StringBuilder sb = new StringBuilder();
foreach (SourceProject p in projects)
{
sb.AppendLine($@"dotnet pack --configuration Release --output ""{outputDir}"" ""{p.ProjectFilePath}""");
}
@ -111,17 +111,17 @@ namespace ConsoleApplication
private static void UpdateVersionNumbers(IEnumerable<SourceProject> projects)
{
foreach (var p in projects)
foreach (SourceProject p in projects)
{
// create a backup file so we can rollback later without breaking formatting
File.Copy(p.FullProjectFilePath, $"{p.FullProjectFilePath}.bak", true);
}
foreach (var p in projects)
foreach (SourceProject p in projects)
{
// TODO force update of all dependent projects to point to the newest build.
// we skip the build number and standard CI prefix on first commits
var newVersion = p.FinalVersionNumber;
string newVersion = p.FinalVersionNumber;
p.UpdateVersion(newVersion);
}
@ -133,13 +133,13 @@ namespace ConsoleApplication
string branch = repo.Head.FriendlyName;
// lets see if we are running in appveyor and if we are use the environment variables instead of the head
var appveryorBranch = Environment.GetEnvironmentVariable("APPVEYOR_REPO_BRANCH");
string appveryorBranch = Environment.GetEnvironmentVariable("APPVEYOR_REPO_BRANCH");
if (!string.IsNullOrWhiteSpace(appveryorBranch))
{
branch = appveryorBranch;
}
var prNumber = Environment.GetEnvironmentVariable("APPVEYOR_PULL_REQUEST_NUMBER");
string prNumber = Environment.GetEnvironmentVariable("APPVEYOR_PULL_REQUEST_NUMBER");
if (!string.IsNullOrWhiteSpace(prNumber))
{
branch = $"PR{int.Parse(prNumber):000}";
@ -159,7 +159,7 @@ namespace ConsoleApplication
private static void CaclulateProjectVersionNumber(List<SourceProject> projects, Repository repo)
{
var branch = CurrentBranch(repo);
string branch = CurrentBranch(repo);
// populate the dependency chains
projects.ForEach(x => x.PopulateDependencies(projects));
@ -176,7 +176,7 @@ namespace ConsoleApplication
}
// revert the project.json change be reverting it but skipp all the git stuff as its not needed
foreach (var p in projectPaths)
foreach (string p in projectPaths)
{
if (File.Exists($"{p}.bak"))
{
@ -303,7 +303,7 @@ namespace ConsoleApplication
/// <param name="branch">The branch.</param>
internal void CalculateVersion(Repository repo, string branch)
{
foreach (var c in repo.Commits)
foreach (Commit c in repo.Commits)
{
if (!this.ApplyCommit(c, repo))
{
@ -335,7 +335,7 @@ namespace ConsoleApplication
this.CommitCountSinceVersionChange++;
// return false if this is a version number root
var projectFileChange = changes.Where(x => x.Path?.Equals(this.ProjectFilePath, StringComparison.OrdinalIgnoreCase) == true).FirstOrDefault();
TreeEntryChanges projectFileChange = changes.Where(x => x.Path?.Equals(this.ProjectFilePath, StringComparison.OrdinalIgnoreCase) == true).FirstOrDefault();
if (projectFileChange != null)
{
if (projectFileChange.Status == ChangeKind.Added)
@ -345,13 +345,13 @@ namespace ConsoleApplication
}
else
{
var blob = repo.Lookup<Blob>(projectFileChange.Oid);
using (var s = blob.GetContentStream())
Blob blob = repo.Lookup<Blob>(projectFileChange.Oid);
using (Stream s = blob.GetContentStream())
{
using (var reader = XmlReader.Create(s))
using (XmlReader reader = XmlReader.Create(s))
{
var proj = ProjectRootElement.Create(reader);
var version = new NuGetVersion(proj.Properties.FirstOrDefault(x => x.Name == "VersionPrefix").Value);
ProjectRootElement proj = ProjectRootElement.Create(reader);
NuGetVersion version = new NuGetVersion(proj.Properties.FirstOrDefault(x => x.Name == "VersionPrefix").Value);
if (version != this.Version)
{
// version changed
@ -370,9 +370,9 @@ namespace ConsoleApplication
private bool ApplyCommit(Commit commit, Repository repo)
{
foreach (var parent in commit.Parents)
foreach (Commit parent in commit.Parents)
{
var changes = repo.Diff.Compare<TreeChanges>(parent.Tree, commit.Tree);
TreeChanges changes = repo.Diff.Compare<TreeChanges>(parent.Tree, commit.Tree);
foreach (TreeEntryChanges change in changes)
{
@ -399,7 +399,7 @@ namespace ConsoleApplication
private string CalculateVersionNumber(string branch)
{
var version = this.Version.ToFullString();
string version = this.Version.ToFullString();
// master only
if (this.CommitCountSinceVersionChange == 1 && branch == "master")
@ -414,12 +414,12 @@ namespace ConsoleApplication
return version;
}
var rootSpecialVersion = string.Empty;
string rootSpecialVersion = string.Empty;
if (this.Version.IsPrerelease)
{
// probably a much easy way for doing this but it work sell enough for a build script
var parts = version.Split(new[] { '-' }, 2);
string[] parts = version.Split(new[] { '-' }, 2);
version = parts[0];
rootSpecialVersion = parts[1];
}
@ -447,7 +447,7 @@ namespace ConsoleApplication
branch = "-" + branch;
}
var maxLength = 20; // dotnet will fail to populate the package if the tag is > 20
int maxLength = 20; // dotnet will fail to populate the package if the tag is > 20
maxLength -= rootSpecialVersion.Length; // this is a required tag
maxLength -= 7; // for the counter and dashes

2
src/ImageSharp.Drawing/Brushes/ImageBrush{TColor}.cs

@ -91,7 +91,7 @@ namespace ImageSharp.Drawing.Brushes
{
get
{
var point = new Vector2(x, y);
Vector2 point = new Vector2(x, y);
// Offset the requested pixel by the value in the rectangle (the shapes position)
point = point - this.offset;

2
src/ImageSharp.Drawing/Brushes/RecolorBrush{TColor}.cs

@ -124,7 +124,7 @@ namespace ImageSharp.Drawing.Brushes
float distance = Vector4.DistanceSquared(background, this.sourceColor);
if (distance <= this.threshold)
{
var lerpAmount = (this.threshold - distance) / this.threshold;
float lerpAmount = (this.threshold - distance) / this.threshold;
Vector4 blended = Vector4BlendTransforms.PremultipliedLerp(
background,
this.targetColor,

22
src/ImageSharp.Drawing/Pens/Pen{TColor}.cs

@ -146,7 +146,7 @@ namespace ImageSharp.Drawing.Pens
public override ColoredPointInfo<TColor> GetColor(int x, int y, PointInfo info)
{
var result = default(ColoredPointInfo<TColor>);
ColoredPointInfo<TColor> result = default(ColoredPointInfo<TColor>);
result.Color = this.brush[x, y];
if (info.DistanceFromPath < this.halfWidth)
@ -178,7 +178,7 @@ namespace ImageSharp.Drawing.Pens
this.pattern = new float[pattern.Length + 1];
this.pattern[0] = 0;
for (var i = 0; i < pattern.Length; i++)
for (int i = 0; i < pattern.Length; i++)
{
this.totalLength += pattern[i] * width;
this.pattern[i + 1] = this.totalLength;
@ -199,10 +199,10 @@ namespace ImageSharp.Drawing.Pens
public override ColoredPointInfo<TColor> GetColor(int x, int y, PointInfo info)
{
var infoResult = default(ColoredPointInfo<TColor>);
ColoredPointInfo<TColor> infoResult = default(ColoredPointInfo<TColor>);
infoResult.DistanceFromElement = float.MaxValue; // is really outside the element
var length = info.DistanceAlongPath % this.totalLength;
float length = info.DistanceAlongPath % this.totalLength;
// we can treat the DistanceAlongPath and DistanceFromPath as x,y coords for the pattern
// we need to calcualte the distance from the outside edge of the pattern
@ -221,10 +221,10 @@ namespace ImageSharp.Drawing.Pens
distanceWAway = info.DistanceFromPath - this.halfWidth;
}
for (var i = 0; i < this.pattern.Length - 1; i++)
for (int i = 0; i < this.pattern.Length - 1; i++)
{
var start = this.pattern[i];
var end = this.pattern[i + 1];
float start = this.pattern[i];
float end = this.pattern[i + 1];
if (length >= start && length < end)
{
@ -238,12 +238,12 @@ namespace ImageSharp.Drawing.Pens
else
{
// this is a none solid part
var distanceFromStart = length - start;
var distanceFromEnd = end - length;
float distanceFromStart = length - start;
float distanceFromEnd = end - length;
var closestEdge = Math.Min(distanceFromStart, distanceFromEnd);
float closestEdge = Math.Min(distanceFromStart, distanceFromEnd);
var distanceAcross = closestEdge;
float distanceAcross = closestEdge;
if (distanceWAway > 0)
{

4
src/ImageSharp/Colors/PackedPixel/Argb.cs

@ -307,7 +307,7 @@ namespace ImageSharp
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static uint Pack(float x, float y, float z, float w)
{
var value = new Vector4(x, y, z, w);
Vector4 value = new Vector4(x, y, z, w);
return Pack(ref value);
}
@ -333,7 +333,7 @@ namespace ImageSharp
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static uint Pack(ref Vector3 vector)
{
var value = new Vector4(vector, 1);
Vector4 value = new Vector4(vector, 1);
return Pack(ref value);
}

4
src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegBlockProcessor.cs

@ -71,8 +71,8 @@ namespace ImageSharp.Formats.Jpg
DCT.TransformIDCT(ref *b, ref *this.pointers.Temp1, ref *this.pointers.Temp2);
var destChannel = decoder.GetDestinationChannel(this.componentIndex);
var destArea = destChannel.GetOffsetedSubAreaForBlock(decodedBlock.Bx, decodedBlock.By);
JpegPixelArea destChannel = decoder.GetDestinationChannel(this.componentIndex);
JpegPixelArea destArea = destChannel.GetOffsetedSubAreaForBlock(decodedBlock.Bx, decodedBlock.By);
destArea.LoadColorsFrom(this.pointers.Temp1, this.pointers.Temp2);
}

2
src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegPixelArea.cs

@ -78,7 +78,7 @@ namespace ImageSharp.Formats.Jpg
public static JpegPixelArea CreatePooled(int width, int height)
{
int size = width * height;
var pixels = BytePool.Rent(size);
byte[] pixels = BytePool.Rent(size);
return new JpegPixelArea(pixels, width, 0);
}

4
src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegScanDecoder.cs

@ -305,7 +305,7 @@ namespace ImageSharp.Formats.Jpg
/// <param name="scanIndex">The index of the scan</param>
private void DecodeBlock(JpegDecoderCore decoder, int scanIndex)
{
var b = this.pointers.Block;
Block8x8F* b = this.pointers.Block;
int huffmannIdx = (HuffmanTree.AcTableIndex * HuffmanTree.ThRowSize) + this.pointers.ComponentScan[scanIndex].AcTableSelector;
if (this.ah != 0)
{
@ -630,7 +630,7 @@ namespace ImageSharp.Formats.Jpg
/// <returns>The <see cref="int" /></returns>
private int RefineNonZeroes(ref InputProcessor bp, int zig, int nz, int delta)
{
var b = this.pointers.Block;
Block8x8F* b = this.pointers.Block;
for (; zig <= this.zigEnd; zig++)
{
int u = this.pointers.Unzig[zig];

2
src/ImageSharp/IO/EndianBinaryWriter.cs

@ -52,7 +52,7 @@ namespace ImageSharp.IO
/// </param>
public EndianBinaryWriter(Endianness endianness, Stream stream, Encoding encoding)
{
var bitConverter = EndianBitConverter.GetConverter(endianness);
EndianBitConverter bitConverter = EndianBitConverter.GetConverter(endianness);
// TODO: Use Guard
if (bitConverter == null)

2
src/ImageSharp/Image/Image{TColor}.cs

@ -168,7 +168,7 @@ namespace ImageSharp
: base(configuration)
{
Guard.NotNull(filePath, nameof(filePath));
using (var fs = File.OpenRead(filePath))
using (FileStream fs = File.OpenRead(filePath))
{
this.Load(fs, options);
}

2
tests/ImageSharp.Benchmarks/Drawing/DrawBeziers.cs

@ -28,7 +28,7 @@ namespace ImageSharp.Benchmarks
{
graphics.InterpolationMode = InterpolationMode.Default;
graphics.SmoothingMode = SmoothingMode.AntiAlias;
var pen = new Pen(System.Drawing.Color.HotPink, 10);
Pen pen = new Pen(System.Drawing.Color.HotPink, 10);
graphics.DrawBeziers(pen, new[] {
new PointF(10, 500),
new PointF(30, 10),

2
tests/ImageSharp.Benchmarks/Drawing/DrawLines.cs

@ -28,7 +28,7 @@ namespace ImageSharp.Benchmarks
{
graphics.InterpolationMode = InterpolationMode.Default;
graphics.SmoothingMode = SmoothingMode.AntiAlias;
var pen = new Pen(System.Drawing.Color.HotPink, 10);
Pen pen = new Pen(System.Drawing.Color.HotPink, 10);
graphics.DrawLines(pen, new[] {
new PointF(10, 10),
new PointF(550, 50),

2
tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs

@ -27,7 +27,7 @@ namespace ImageSharp.Benchmarks
{
graphics.InterpolationMode = InterpolationMode.Default;
graphics.SmoothingMode = SmoothingMode.AntiAlias;
var pen = new Pen(System.Drawing.Color.HotPink, 10);
Pen pen = new Pen(System.Drawing.Color.HotPink, 10);
graphics.DrawPolygon(pen, new[] {
new PointF(10, 10),
new PointF(550, 50),

2
tests/ImageSharp.Benchmarks/Drawing/FillWithPattern.cs

@ -25,7 +25,7 @@ namespace ImageSharp.Benchmarks
using (Graphics graphics = Graphics.FromImage(destination))
{
graphics.SmoothingMode = SmoothingMode.AntiAlias;
var brush = new HatchBrush(HatchStyle.BackwardDiagonal, System.Drawing.Color.HotPink);
HatchBrush brush = new HatchBrush(HatchStyle.BackwardDiagonal, System.Drawing.Color.HotPink);
graphics.FillRectangle(brush, new Rectangle(0,0, 800,800)); // can't find a way to flood fill with a brush
}
using (MemoryStream ms = new MemoryStream())

20
tests/ImageSharp.Benchmarks/Image/MultiImageBenchmarkBase.cs

@ -104,13 +104,13 @@ namespace ImageSharp.Benchmarks.Image
continue;
}
var allFiles =
string[] allFiles =
this.SearchPatterns.SelectMany(
f =>
Directory.EnumerateFiles(path, f, SearchOption.AllDirectories)
.Where(fn => !this.ExcludeSubstringsInFileNames.Any(w => fn.ToLower().Contains(w)))).ToArray();
foreach (var fn in allFiles)
foreach (string fn in allFiles)
{
this.FileNamesToBytes[fn] = File.ReadAllBytes(fn);
}
@ -123,13 +123,13 @@ namespace ImageSharp.Benchmarks.Image
/// <param name="operation">The operation to execute. If the returned object is &lt;see cref="IDisposable"/&gt; it will be disposed </param>
protected void ForEachStream(Func<MemoryStream, object> operation)
{
foreach (var kv in this.FileNames2Bytes)
foreach (KeyValuePair<string, byte[]> kv in this.FileNames2Bytes)
{
using (MemoryStream memoryStream = new MemoryStream(kv.Value))
{
try
{
var obj = operation(memoryStream);
object obj = operation(memoryStream);
(obj as IDisposable)?.Dispose();
}
@ -147,12 +147,12 @@ namespace ImageSharp.Benchmarks.Image
{
base.ReadFilesImpl();
foreach (var kv in this.FileNamesToBytes)
foreach (KeyValuePair<string, byte[]> kv in this.FileNamesToBytes)
{
byte[] bytes = kv.Value;
string fn = kv.Key;
using (var ms1 = new MemoryStream(bytes))
using (MemoryStream ms1 = new MemoryStream(bytes))
{
this.FileNamesToImageSharpImages[fn] = new Image(ms1);
@ -178,11 +178,11 @@ namespace ImageSharp.Benchmarks.Image
protected void ForEachImageSharpImage(Func<Image, object> operation)
{
foreach (var kv in this.FileNames2ImageSharpImages)
foreach (KeyValuePair<string, Image> kv in this.FileNames2ImageSharpImages)
{
try
{
var obj = operation(kv.Value);
object obj = operation(kv.Value);
(obj as IDisposable)?.Dispose();
}
@ -213,11 +213,11 @@ namespace ImageSharp.Benchmarks.Image
protected void ForEachSystemDrawingImage(Func<System.Drawing.Bitmap, object> operation)
{
foreach (var kv in this.FileNames2SystemDrawingImages)
foreach (KeyValuePair<string, Bitmap> kv in this.FileNames2SystemDrawingImages)
{
try
{
var obj = operation(kv.Value);
object obj = operation(kv.Value);
(obj as IDisposable)?.Dispose();
}
catch (Exception ex)

2
tests/ImageSharp.Tests/Colors/BulkPixelOperationsTests.cs

@ -368,7 +368,7 @@ namespace ImageSharp.Tests.Colors
where TSource : struct
where TDest : struct
{
using (var buffers = new TestBuffers<TSource, TDest>(source, expected))
using (TestBuffers<TSource, TDest> buffers = new TestBuffers<TSource, TDest>(source, expected))
{
action(buffers.Source, buffers.ActualDest);
buffers.Verify();

34
tests/ImageSharp.Tests/Colors/ColorConstructorTests.cs

@ -15,7 +15,7 @@ namespace ImageSharp.Tests.Colors
{
get
{
var vector4Values = new Vector4[]
Vector4[] vector4Values = new Vector4[]
{
Vector4.Zero,
Vector4.One,
@ -25,10 +25,10 @@ namespace ImageSharp.Tests.Colors
Vector4.UnitW,
};
foreach (var vector4 in vector4Values)
foreach (Vector4 vector4 in vector4Values)
{
// using float array to work around a bug in xunit corruptint the state of any Vector4 passed as MemberData
var vector4Components = new float[] { vector4.X, vector4.Y, vector4.Z, vector4.W };
float[] vector4Components = new float[] { vector4.X, vector4.Y, vector4.Z, vector4.W };
yield return new object[] { new Argb(vector4), vector4Components };
yield return new object[] { new Bgra4444(vector4), vector4Components };
@ -48,7 +48,7 @@ namespace ImageSharp.Tests.Colors
{
get
{
var vector3Values = new Dictionary<Vector3, Vector4>()
Dictionary<Vector3, Vector4> vector3Values = new Dictionary<Vector3, Vector4>()
{
{ Vector3.One, Vector4.One },
{ Vector3.Zero, new Vector4(0, 0, 0, 1) },
@ -57,11 +57,11 @@ namespace ImageSharp.Tests.Colors
{ Vector3.UnitZ, new Vector4(0, 0, 1, 1) },
};
foreach (var vector3 in vector3Values.Keys)
foreach (Vector3 vector3 in vector3Values.Keys)
{
var vector4 = vector3Values[vector3];
Vector4 vector4 = vector3Values[vector3];
// using float array to work around a bug in xunit corruptint the state of any Vector4 passed as MemberData
var vector4Components = new float[] { vector4.X, vector4.Y, vector4.Z, vector4.W };
float[] vector4Components = new float[] { vector4.X, vector4.Y, vector4.Z, vector4.W };
yield return new object[] { new Argb(vector3), vector4Components };
yield return new object[] { new Bgr565(vector3), vector4Components };
@ -73,7 +73,7 @@ namespace ImageSharp.Tests.Colors
{
get
{
var vector4Values = new Vector4[]
Vector4[] vector4Values = new Vector4[]
{
Vector4.Zero,
Vector4.One,
@ -83,10 +83,10 @@ namespace ImageSharp.Tests.Colors
Vector4.UnitW,
};
foreach (var vector4 in vector4Values)
foreach (Vector4 vector4 in vector4Values)
{
// using float array to work around a bug in xunit corruptint the state of any Vector4 passed as MemberData
var vector4Components = new float[] { vector4.X, vector4.Y, vector4.Z, vector4.W };
float[] vector4Components = new float[] { vector4.X, vector4.Y, vector4.Z, vector4.W };
yield return new object[] { new Argb(vector4.X, vector4.Y, vector4.Z, vector4.W), vector4Components };
yield return new object[] { new Bgra4444(vector4.X, vector4.Y, vector4.Z, vector4.W), vector4Components };
@ -106,7 +106,7 @@ namespace ImageSharp.Tests.Colors
{
get
{
var vector3Values = new Dictionary<Vector3, Vector4>()
Dictionary<Vector3, Vector4> vector3Values = new Dictionary<Vector3, Vector4>()
{
{ Vector3.One, Vector4.One },
{ Vector3.Zero, new Vector4(0, 0, 0, 1) },
@ -115,11 +115,11 @@ namespace ImageSharp.Tests.Colors
{ Vector3.UnitZ, new Vector4(0, 0, 1, 1) },
};
foreach (var vector3 in vector3Values.Keys)
foreach (Vector3 vector3 in vector3Values.Keys)
{
var vector4 = vector3Values[vector3];
Vector4 vector4 = vector3Values[vector3];
// using float array to work around a bug in xunit corruptint the state of any Vector4 passed as MemberData
var vector4Components = new float[] { vector4.X, vector4.Y, vector4.Z, vector4.W };
float[] vector4Components = new float[] { vector4.X, vector4.Y, vector4.Z, vector4.W };
yield return new object[] { new Argb(vector3.X, vector3.Y, vector3.Z), vector4Components };
yield return new object[] { new Bgr565(vector3.X, vector3.Y, vector3.Z), vector4Components };
@ -135,12 +135,12 @@ namespace ImageSharp.Tests.Colors
public void ConstructorToVector4(IPixel packedVector, float[] expectedVector4Components)
{
// Arrange
var precision = 2;
int precision = 2;
// using float array to work around a bug in xunit corruptint the state of any Vector4 passed as MemberData
var expectedVector4 = new Vector4(expectedVector4Components[0], expectedVector4Components[1], expectedVector4Components[2], expectedVector4Components[3]);
Vector4 expectedVector4 = new Vector4(expectedVector4Components[0], expectedVector4Components[1], expectedVector4Components[2], expectedVector4Components[3]);
// Act
var vector4 = packedVector.ToVector4();
Vector4 vector4 = packedVector.ToVector4();
// Assert
Assert.Equal(expectedVector4.X, vector4.X, precision);

20
tests/ImageSharp.Tests/Colors/ColorEqualityTests.cs

@ -238,7 +238,7 @@ namespace ImageSharp.Tests.Colors
public void Equality(object first, object second, Type type)
{
// Act
var equal = first.Equals(second);
bool equal = first.Equals(second);
// Assert
Assert.True(equal);
@ -254,7 +254,7 @@ namespace ImageSharp.Tests.Colors
public void NotEquality(object first, object second, Type type)
{
// Act
var equal = first.Equals(second);
bool equal = first.Equals(second);
// Assert
Assert.False(equal);
@ -266,7 +266,7 @@ namespace ImageSharp.Tests.Colors
public void HashCodeEqual(object first, object second, Type type)
{
// Act
var equal = first.GetHashCode() == second.GetHashCode();
bool equal = first.GetHashCode() == second.GetHashCode();
// Assert
Assert.True(equal);
@ -278,7 +278,7 @@ namespace ImageSharp.Tests.Colors
public void HashCodeNotEqual(object first, object second, Type type)
{
// Act
var equal = first.GetHashCode() == second.GetHashCode();
bool equal = first.GetHashCode() == second.GetHashCode();
// Assert
Assert.False(equal);
@ -297,7 +297,7 @@ namespace ImageSharp.Tests.Colors
dynamic secondObject = Convert.ChangeType(second, type);
// Act
var equal = firstObject.Equals(secondObject);
dynamic equal = firstObject.Equals(secondObject);
// Assert
Assert.True(equal);
@ -316,7 +316,7 @@ namespace ImageSharp.Tests.Colors
dynamic secondObject = Convert.ChangeType(second, type);
// Act
var equal = firstObject.Equals(secondObject);
dynamic equal = firstObject.Equals(secondObject);
// Assert
Assert.False(equal);
@ -335,7 +335,7 @@ namespace ImageSharp.Tests.Colors
dynamic secondObject = Convert.ChangeType(second, type);
// Act
var equal = firstObject == secondObject;
dynamic equal = firstObject == secondObject;
// Assert
Assert.True(equal);
@ -354,7 +354,7 @@ namespace ImageSharp.Tests.Colors
dynamic secondObject = Convert.ChangeType(second, type);
// Act
var notEqual = firstObject != secondObject;
dynamic notEqual = firstObject != secondObject;
// Assert
Assert.True(notEqual);
@ -372,7 +372,7 @@ namespace ImageSharp.Tests.Colors
dynamic secondObject = Convert.ChangeType(second, type);
// Act
var almostEqual = firstObject.AlmostEquals(secondObject, precision);
dynamic almostEqual = firstObject.AlmostEquals(secondObject, precision);
// Assert
Assert.True(almostEqual);
@ -390,7 +390,7 @@ namespace ImageSharp.Tests.Colors
dynamic secondObject = Convert.ChangeType(second, type);
// Act
var almostEqual = firstObject.AlmostEquals(secondObject, precision);
dynamic almostEqual = firstObject.AlmostEquals(secondObject, precision);
// Assert
Assert.False(almostEqual);

18
tests/ImageSharp.Tests/Colors/ColorPackingTests.cs

@ -15,7 +15,7 @@ namespace ImageSharp.Tests.Colors
{
get
{
var vector4Values = new Vector4[]
Vector4[] vector4Values = new Vector4[]
{
Vector4.Zero,
Vector4.One,
@ -25,9 +25,9 @@ namespace ImageSharp.Tests.Colors
Vector4.UnitW,
};
foreach (var vector4 in vector4Values)
foreach (Vector4 vector4 in vector4Values)
{
var vector4Components = new float[] { vector4.X, vector4.Y, vector4.Z, vector4.W };
float[] vector4Components = new float[] { vector4.X, vector4.Y, vector4.Z, vector4.W };
yield return new object[] { new Argb(), vector4Components };
yield return new object[] { new Bgra4444(), vector4Components };
@ -47,7 +47,7 @@ namespace ImageSharp.Tests.Colors
{
get
{
var vector4Values = new Vector4[]
Vector4[] vector4Values = new Vector4[]
{
Vector4.One,
new Vector4(0, 0, 0, 1),
@ -56,9 +56,9 @@ namespace ImageSharp.Tests.Colors
new Vector4(0, 0, 1, 1),
};
foreach (var vector4 in vector4Values)
foreach (Vector4 vector4 in vector4Values)
{
var vector4Components = new float[] { vector4.X, vector4.Y, vector4.Z, vector4.W };
float[] vector4Components = new float[] { vector4.X, vector4.Y, vector4.Z, vector4.W };
yield return new object[] { new Argb(), vector4Components };
yield return new object[] { new Bgr565(), vector4Components };
@ -72,12 +72,12 @@ namespace ImageSharp.Tests.Colors
public void FromVector4ToVector4(IPixel packedVector, float[] vector4ComponentsToPack)
{
// Arrange
var precision = 2;
var vector4ToPack = new Vector4(vector4ComponentsToPack[0], vector4ComponentsToPack[1], vector4ComponentsToPack[2], vector4ComponentsToPack[3]);
int precision = 2;
Vector4 vector4ToPack = new Vector4(vector4ComponentsToPack[0], vector4ComponentsToPack[1], vector4ComponentsToPack[2], vector4ComponentsToPack[3]);
packedVector.PackFromVector4(vector4ToPack);
// Act
var vector4 = packedVector.ToVector4();
Vector4 vector4 = packedVector.ToVector4();
// Assert
Assert.Equal(vector4ToPack.X, vector4.X, precision);

2
tests/ImageSharp.Tests/Common/PinnedBufferTests.cs

@ -78,7 +78,7 @@
using (PinnedBuffer<Foo> buffer = new PinnedBuffer<Foo>(a))
{
var arrayPtr = buffer.Slice();
BufferPointer<Foo> arrayPtr = buffer.Slice();
Assert.Equal(a, arrayPtr.Array);
Assert.Equal(0, arrayPtr.Offset);

2
tests/ImageSharp.Tests/ConfigurationTests.cs

@ -21,7 +21,7 @@ namespace ImageSharp.Tests
[Fact]
public void IfAutoloadWellknwonFormatesIsTrueAllFormateAreLoaded()
{
var configuration = Configuration.CreateDefaultInstance();
Configuration configuration = Configuration.CreateDefaultInstance();
Assert.Equal(4, configuration.ImageFormats.Count);
}

4
tests/ImageSharp.Tests/Drawing/LineComplexPolygonTests.cs

@ -21,12 +21,12 @@ namespace ImageSharp.Tests.Drawing
{
string path = this.CreateOutputDirectory("Drawing", "LineComplexPolygon");
var simplePath = new Polygon(new LinearLineSegment(
Polygon simplePath = new Polygon(new LinearLineSegment(
new Vector2(10, 10),
new Vector2(200, 150),
new Vector2(50, 300)));
var hole1 = new Polygon(new LinearLineSegment(
Polygon hole1 = new Polygon(new LinearLineSegment(
new Vector2(37, 85),
new Vector2(93, 85),
new Vector2(65, 137)));

2
tests/ImageSharp.Tests/Drawing/SolidComplexPolygonTests.cs

@ -28,7 +28,7 @@ namespace ImageSharp.Tests.Drawing
new Vector2(37, 85),
new Vector2(93, 85),
new Vector2(65, 137)));
var clipped = simplePath.Clip(hole1);
IPath clipped = simplePath.Clip(hole1);
// var clipped = new Rectangle(10, 10, 100, 100).Clip(new Rectangle(20, 0, 20, 20));
using (Image image = new Image(500, 500))
{

6
tests/ImageSharp.Tests/Drawing/SolidPolygonTests.cs

@ -209,7 +209,7 @@ namespace ImageSharp.Tests.Drawing
{
string path = this.CreateOutputDirectory("Drawing", "FilledPolygons");
var config = Configuration.CreateDefaultInstance();
Configuration config = Configuration.CreateDefaultInstance();
config.ParallelOptions.MaxDegreeOfParallelism = 1;
using (Image image = new Image(100, 100, config))
{
@ -228,7 +228,7 @@ namespace ImageSharp.Tests.Drawing
{
string path = this.CreateOutputDirectory("Drawing", "FilledPolygons");
var config = Configuration.CreateDefaultInstance();
Configuration config = Configuration.CreateDefaultInstance();
config.ParallelOptions.MaxDegreeOfParallelism = 1;
using (Image image = new Image(100, 100, config))
{
@ -248,7 +248,7 @@ namespace ImageSharp.Tests.Drawing
{
string path = this.CreateOutputDirectory("Drawing", "FilledPolygons");
var config = Configuration.CreateDefaultInstance();
Configuration config = Configuration.CreateDefaultInstance();
config.ParallelOptions.MaxDegreeOfParallelism = 1;
using (Image image = new Image(200, 200, config))
{

6
tests/ImageSharp.Tests/Drawing/Text/GlyphBuilder.cs

@ -16,7 +16,7 @@ namespace ImageSharp.Tests.Drawing.Text
public void OriginUsed()
{
// Y axis is inverted as it expects to be drawing for bottom left
var fullBuilder = new GlyphBuilder(new System.Numerics.Vector2(10, 99));
GlyphBuilder fullBuilder = new GlyphBuilder(new System.Numerics.Vector2(10, 99));
IGlyphRenderer builder = fullBuilder;
builder.BeginGlyph();
@ -36,7 +36,7 @@ namespace ImageSharp.Tests.Drawing.Text
builder.EndFigure();
builder.EndGlyph();
var points = fullBuilder.Paths.Single().Flatten().Single().Points;
System.Collections.Immutable.ImmutableArray<Vector2> points = fullBuilder.Paths.Single().Flatten().Single().Points;
Assert.Contains(new Vector2(10, 99), points);
Assert.Contains(new Vector2(10, 109), points);
@ -50,7 +50,7 @@ namespace ImageSharp.Tests.Drawing.Text
// Y axis is inverted as it expects to be drawing for bottom left
GlyphBuilder fullBuilder = new GlyphBuilder();
IGlyphRenderer builder = fullBuilder;
for (var i = 0; i < 10; i++)
for (int i = 0; i < 10; i++)
{
builder.BeginGlyph();
builder.BeginFigure();

2
tests/ImageSharp.Tests/Drawing/Text/OutputText.cs

@ -30,7 +30,7 @@ namespace ImageSharp.Tests.Drawing.Text
public void DrawAB()
{
//draws 2 overlapping triangle glyphs twice 1 set on each line
using (var img = new Image(100, 200))
using (Image img = new Image(100, 200))
{
img.Fill(Color.DarkBlue)
.DrawText("AB\nAB", new Font(this.Font, 50), Color.Red, new Vector2(0, 0));

6
tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs

@ -15,7 +15,7 @@ namespace ImageSharp.Tests
[Fact]
public void Decode_IgnoreMetadataIsFalse_CommentsAreRead()
{
var options = new DecoderOptions()
DecoderOptions options = new DecoderOptions()
{
IgnoreMetadata = false
};
@ -33,7 +33,7 @@ namespace ImageSharp.Tests
[Fact]
public void Decode_IgnoreMetadataIsTrue_CommentsAreIgnored()
{
var options = new DecoderOptions()
DecoderOptions options = new DecoderOptions()
{
IgnoreMetadata = true
};
@ -49,7 +49,7 @@ namespace ImageSharp.Tests
[Fact]
public void Decode_TextEncodingSetToUnicode_TextIsReadWithCorrectEncoding()
{
var options = new GifDecoderOptions()
GifDecoderOptions options = new GifDecoderOptions()
{
TextEncoding = Encoding.Unicode
};

4
tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs

@ -15,7 +15,7 @@ namespace ImageSharp.Tests
[Fact]
public void Encode_IgnoreMetadataIsFalse_CommentsAreWritten()
{
var options = new EncoderOptions()
EncoderOptions options = new EncoderOptions()
{
IgnoreMetadata = false
};
@ -42,7 +42,7 @@ namespace ImageSharp.Tests
[Fact]
public void Encode_IgnoreMetadataIsTrue_CommentsAreNotWritten()
{
var options = new GifEncoderOptions()
GifEncoderOptions options = new GifEncoderOptions()
{
IgnoreMetadata = true
};

40
tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs

@ -278,7 +278,7 @@ namespace ImageSharp.Tests
[InlineData(3)]
public void TransformIDCT(int seed)
{
var sourceArray = Create8x8RandomFloatData(-200, 200, seed);
MutableSpan<float> sourceArray = Create8x8RandomFloatData(-200, 200, seed);
float[] expectedDestArray = new float[64];
float[] tempArray = new float[64];
@ -306,7 +306,7 @@ namespace ImageSharp.Tests
[Fact]
public unsafe void CopyColorsTo()
{
var data = Create8x8FloatData();
float[] data = Create8x8FloatData();
Block8x8F block = new Block8x8F();
block.LoadFrom(data);
block.MultiplyAllInplace(new Vector4(5, 5, 5, 5));
@ -348,7 +348,7 @@ namespace ImageSharp.Tests
public void TransformByteConvetibleColorValuesInto()
{
Block8x8F block = new Block8x8F();
var input = Create8x8ColorCropTestData();
float[] input = Create8x8ColorCropTestData();
block.LoadFrom(input);
this.Output.WriteLine("Input:");
this.PrintLinearData(input);
@ -371,18 +371,18 @@ namespace ImageSharp.Tests
[InlineData(2)]
public void FDCT8x4_LeftPart(int seed)
{
var src = Create8x8RandomFloatData(-200, 200, seed);
var srcBlock = new Block8x8F();
MutableSpan<float> src = Create8x8RandomFloatData(-200, 200, seed);
Block8x8F srcBlock = new Block8x8F();
srcBlock.LoadFrom(src);
var destBlock = new Block8x8F();
Block8x8F destBlock = new Block8x8F();
var expectedDest = new MutableSpan<float>(64);
MutableSpan<float> expectedDest = new MutableSpan<float>(64);
ReferenceImplementations.fDCT2D8x4_32f(src, expectedDest);
DCT.FDCT8x4_LeftPart(ref srcBlock, ref destBlock);
var actualDest = new MutableSpan<float>(64);
MutableSpan<float> actualDest = new MutableSpan<float>(64);
destBlock.CopyTo(actualDest);
Assert.Equal(actualDest.Data, expectedDest.Data, new ApproximateFloatComparer(1f));
@ -393,18 +393,18 @@ namespace ImageSharp.Tests
[InlineData(2)]
public void FDCT8x4_RightPart(int seed)
{
var src = Create8x8RandomFloatData(-200, 200, seed);
var srcBlock = new Block8x8F();
MutableSpan<float> src = Create8x8RandomFloatData(-200, 200, seed);
Block8x8F srcBlock = new Block8x8F();
srcBlock.LoadFrom(src);
var destBlock = new Block8x8F();
Block8x8F destBlock = new Block8x8F();
var expectedDest = new MutableSpan<float>(64);
MutableSpan<float> expectedDest = new MutableSpan<float>(64);
ReferenceImplementations.fDCT2D8x4_32f(src.Slice(4), expectedDest.Slice(4));
DCT.FDCT8x4_RightPart(ref srcBlock, ref destBlock);
var actualDest = new MutableSpan<float>(64);
MutableSpan<float> actualDest = new MutableSpan<float>(64);
destBlock.CopyTo(actualDest);
Assert.Equal(actualDest.Data, expectedDest.Data, new ApproximateFloatComparer(1f));
@ -415,20 +415,20 @@ namespace ImageSharp.Tests
[InlineData(2)]
public void TransformFDCT(int seed)
{
var src = Create8x8RandomFloatData(-200, 200, seed);
var srcBlock = new Block8x8F();
MutableSpan<float> src = Create8x8RandomFloatData(-200, 200, seed);
Block8x8F srcBlock = new Block8x8F();
srcBlock.LoadFrom(src);
var destBlock = new Block8x8F();
Block8x8F destBlock = new Block8x8F();
var expectedDest = new MutableSpan<float>(64);
var temp1 = new MutableSpan<float>(64);
var temp2 = new Block8x8F();
MutableSpan<float> expectedDest = new MutableSpan<float>(64);
MutableSpan<float> temp1 = new MutableSpan<float>(64);
Block8x8F temp2 = new Block8x8F();
ReferenceImplementations.fDCT2D_llm(src, expectedDest, temp1, downscaleBy8: true);
DCT.TransformFDCT(ref srcBlock, ref destBlock, ref temp2, false);
var actualDest = new MutableSpan<float>(64);
MutableSpan<float> actualDest = new MutableSpan<float>(64);
destBlock.CopyTo(actualDest);
Assert.Equal(actualDest.Data, expectedDest.Data, new ApproximateFloatComparer(1f));

4
tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs

@ -125,7 +125,7 @@ namespace ImageSharp.Tests
[Fact]
public void Decode_IgnoreMetadataIsFalse_ExifProfileIsRead()
{
var options = new DecoderOptions()
DecoderOptions options = new DecoderOptions()
{
IgnoreMetadata = false
};
@ -141,7 +141,7 @@ namespace ImageSharp.Tests
[Fact]
public void Decode_IgnoreMetadataIsTrue_ExifProfileIgnored()
{
var options = new DecoderOptions()
DecoderOptions options = new DecoderOptions()
{
IgnoreMetadata = true
};

4
tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs

@ -74,7 +74,7 @@ namespace ImageSharp.Tests
[Fact]
public void Encode_IgnoreMetadataIsFalse_ExifProfileIsWritten()
{
var options = new EncoderOptions()
EncoderOptions options = new EncoderOptions()
{
IgnoreMetadata = false
};
@ -99,7 +99,7 @@ namespace ImageSharp.Tests
[Fact]
public void Encode_IgnoreMetadataIsTrue_ExifProfileIgnored()
{
var options = new JpegEncoderOptions()
JpegEncoderOptions options = new JpegEncoderOptions()
{
IgnoreMetadata = true
};

4
tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs

@ -52,7 +52,7 @@ namespace ImageSharp.Tests.Formats.Jpg
{
MutableSpan<int> original = Create8x8RandomIntData(-200, 200, seed);
var block = original.AddScalarToAllValues(128);
MutableSpan<int> block = original.AddScalarToAllValues(128);
ReferenceImplementations.IntegerReferenceDCT.TransformFDCTInplace(block);
@ -79,7 +79,7 @@ namespace ImageSharp.Tests.Formats.Jpg
[InlineData(2, 0)]
public void FloatingPointDCT_ReferenceImplementation_ForwardThenInverse(int seed, int startAt)
{
var data = Create8x8RandomIntData(-200, 200, seed);
int[] data = Create8x8RandomIntData(-200, 200, seed);
MutableSpan<float> src = new MutableSpan<int>(data).ConvertToFloat32MutableSpan();
MutableSpan<float> dest = new MutableSpan<float>(64);
MutableSpan<float> temp = new MutableSpan<float>(64);

2
tests/ImageSharp.Tests/Formats/Jpg/YCbCrImageTests.cs

@ -55,7 +55,7 @@ namespace ImageSharp.Tests
this.Output.WriteLine($"RATIO: {ratio}");
var img = new YCbCrImage(400, 400, ratio);
YCbCrImage img = new YCbCrImage(400, 400, ratio);
//this.PrintChannel("Y", img.YChannel);
//this.PrintChannel("Cb", img.CbChannel);

6
tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs

@ -15,7 +15,7 @@ namespace ImageSharp.Tests
[Fact]
public void Decode_IgnoreMetadataIsFalse_TextChunckIsRead()
{
var options = new PngDecoderOptions()
PngDecoderOptions options = new PngDecoderOptions()
{
IgnoreMetadata = false
};
@ -33,7 +33,7 @@ namespace ImageSharp.Tests
[Fact]
public void Decode_IgnoreMetadataIsTrue_TextChunksAreIgnored()
{
var options = new PngDecoderOptions()
PngDecoderOptions options = new PngDecoderOptions()
{
IgnoreMetadata = true
};
@ -49,7 +49,7 @@ namespace ImageSharp.Tests
[Fact]
public void Decode_TextEncodingSetToUnicode_TextIsReadWithCorrectEncoding()
{
var options = new PngDecoderOptions()
PngDecoderOptions options = new PngDecoderOptions()
{
TextEncoding = Encoding.Unicode
};

20
tests/ImageSharp.Tests/Image/ImageTests.cs

@ -67,14 +67,14 @@ namespace ImageSharp.Tests
public void Save_DetecedEncoding()
{
string file = TestFile.GetPath("../../TestOutput/Save_DetecedEncoding.png");
var dir = System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(file));
System.IO.DirectoryInfo dir = System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(file));
using (Image image = new Image(10, 10))
{
image.Save(file);
}
var c = TestFile.Create("../../TestOutput/Save_DetecedEncoding.png");
using (var img = c.CreateImage())
TestFile c = TestFile.Create("../../TestOutput/Save_DetecedEncoding.png");
using (Image img = c.CreateImage())
{
Assert.IsType<PngFormat>(img.CurrentImageFormat);
}
@ -84,7 +84,7 @@ namespace ImageSharp.Tests
public void Save_UnknownExtensionsEncoding()
{
string file = TestFile.GetPath("../../TestOutput/Save_DetecedEncoding.tmp");
var ex = Assert.Throws<InvalidOperationException>(
InvalidOperationException ex = Assert.Throws<InvalidOperationException>(
() =>
{
using (Image image = new Image(10, 10))
@ -98,14 +98,14 @@ namespace ImageSharp.Tests
public void Save_SetFormat()
{
string file = TestFile.GetPath("../../TestOutput/Save_SetFormat.dat");
var dir = System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(file));
System.IO.DirectoryInfo dir = System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(file));
using (Image image = new Image(10, 10))
{
image.Save(file, new PngFormat());
}
var c = TestFile.Create("../../TestOutput/Save_SetFormat.dat");
using (var img = c.CreateImage())
TestFile c = TestFile.Create("../../TestOutput/Save_SetFormat.dat");
using (Image img = c.CreateImage())
{
Assert.IsType<PngFormat>(img.CurrentImageFormat);
}
@ -115,14 +115,14 @@ namespace ImageSharp.Tests
public void Save_SetEncoding()
{
string file = TestFile.GetPath("../../TestOutput/Save_SetEncoding.dat");
var dir = System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(file));
System.IO.DirectoryInfo dir = System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(file));
using (Image image = new Image(10, 10))
{
image.Save(file, new PngEncoder());
}
var c = TestFile.Create("../../TestOutput/Save_SetEncoding.dat");
using (var img = c.CreateImage())
TestFile c = TestFile.Create("../../TestOutput/Save_SetEncoding.dat");
using (Image img = c.CreateImage())
{
Assert.IsType<PngFormat>(img.CurrentImageFormat);
}

2
tests/ImageSharp.Tests/MetaData/Profiles/Exif/ExifProfileTests.cs

@ -243,7 +243,7 @@ namespace ImageSharp.Tests
TestProfile(profile);
var thumbnail = profile.CreateThumbnail<Color>();
Image<Color> thumbnail = profile.CreateThumbnail<Color>();
Assert.NotNull(thumbnail);
Assert.Equal(256, thumbnail.Width);
Assert.Equal(170, thumbnail.Height);

2
tests/ImageSharp.Tests/MetaData/Profiles/Exif/ExifTagDescriptionAttributeTests.cs

@ -12,7 +12,7 @@ namespace ImageSharp.Tests
[Fact]
public void TestExifTag()
{
var exifProfile = new ExifProfile();
ExifProfile exifProfile = new ExifProfile();
exifProfile.SetValue(ExifTag.ResolutionUnit, (ushort)1);
ExifValue value = exifProfile.GetValue(ExifTag.ResolutionUnit);

4
tests/ImageSharp.Tests/Processors/Filters/ResizeTests.cs

@ -64,8 +64,8 @@ namespace ImageSharp.Tests
using (Image image = file.CreateImage())
using (FileStream output = File.OpenWrite($"{path}/{filename}"))
{
var sourceRectangle = new Rectangle(image.Width / 8, image.Height / 8, image.Width / 4, image.Height / 4);
var destRectangle = new Rectangle(image.Width / 4, image.Height / 4, image.Width / 2, image.Height / 2);
Rectangle sourceRectangle = new Rectangle(image.Width / 8, image.Height / 8, image.Width / 4, image.Height / 4);
Rectangle destRectangle = new Rectangle(image.Width / 4, image.Height / 4, image.Width / 2, image.Height / 2);
image.Resize(image.Width, image.Height, sampler, sourceRectangle, destRectangle, false).Save(output);
}
}

2
tests/ImageSharp.Tests/TestFile.cs

@ -165,7 +165,7 @@ namespace ImageSharp.Tests
AddFormatsDirectoryFromTestAssebmlyPath(directories);
var directory = directories.FirstOrDefault(x => Directory.Exists(x));
string directory = directories.FirstOrDefault(x => Directory.Exists(x));
if(directory != null)
{

2
tests/ImageSharp.Tests/TestFont.cs

@ -58,7 +58,7 @@ namespace ImageSharp.Tests
AddFormatsDirectoryFromTestAssebmlyPath(directories);
var directory = directories.FirstOrDefault(x => Directory.Exists(x));
string directory = directories.FirstOrDefault(x => Directory.Exists(x));
if(directory != null)
{

12
tests/ImageSharp.Tests/TestUtilities/Attributes/ImageDataAttributeBase.cs

@ -29,25 +29,25 @@ namespace ImageSharp.Tests
public override IEnumerable<object[]> GetData(MethodInfo testMethod)
{
var type = testMethod.GetParameters().First().ParameterType.GetTypeInfo();
TypeInfo type = testMethod.GetParameters().First().ParameterType.GetTypeInfo();
if (!type.IsGenericType || type.GetGenericTypeDefinition() != typeof(TestImageProvider<>))
{
yield return this.AdditionalParameters;
}
else
{
foreach (var kv in this.PixelTypes.ExpandAllTypes())
foreach (KeyValuePair<PixelTypes, Type> kv in this.PixelTypes.ExpandAllTypes())
{
var factoryType = typeof(TestImageProvider<>).MakeGenericType(kv.Value);
Type factoryType = typeof(TestImageProvider<>).MakeGenericType(kv.Value);
foreach (object[] originalFacoryMethodArgs in this.GetAllFactoryMethodArgs(testMethod, factoryType))
{
var actualFactoryMethodArgs = new object[originalFacoryMethodArgs.Length + 2];
object[] actualFactoryMethodArgs = new object[originalFacoryMethodArgs.Length + 2];
Array.Copy(originalFacoryMethodArgs, actualFactoryMethodArgs, originalFacoryMethodArgs.Length);
actualFactoryMethodArgs[actualFactoryMethodArgs.Length - 2] = testMethod;
actualFactoryMethodArgs[actualFactoryMethodArgs.Length - 1] = kv.Key;
var factory = factoryType.GetMethod(this.GetFactoryMethodName(testMethod))
object factory = factoryType.GetMethod(this.GetFactoryMethodName(testMethod))
.Invoke(null, actualFactoryMethodArgs);
object[] result = new object[this.AdditionalParameters.Length + 1];
@ -61,7 +61,7 @@ namespace ImageSharp.Tests
protected virtual IEnumerable<object[]> GetAllFactoryMethodArgs(MethodInfo testMethod, Type factoryType)
{
var args = this.GetFactoryMethodArgs(testMethod, factoryType);
object[] args = this.GetFactoryMethodArgs(testMethod, factoryType);
return Enumerable.Repeat(args, 1);
}

6
tests/ImageSharp.Tests/TestUtilities/Attributes/WithFileCollectionAttribute.cs

@ -36,7 +36,7 @@ namespace ImageSharp.Tests
protected override IEnumerable<object[]> GetAllFactoryMethodArgs(MethodInfo testMethod, Type factoryType)
{
var accessor = this.GetPropertyAccessor(testMethod.DeclaringType);
Func<object> accessor = this.GetPropertyAccessor(testMethod.DeclaringType);
accessor = accessor ?? this.GetFieldAccessor(testMethod.DeclaringType);
@ -52,7 +52,7 @@ namespace ImageSharp.Tests
private Func<object> GetFieldAccessor(Type type)
{
FieldInfo fieldInfo = null;
for (var reflectionType = type;
for (Type reflectionType = type;
reflectionType != null;
reflectionType = reflectionType.GetTypeInfo().BaseType)
{
@ -71,7 +71,7 @@ namespace ImageSharp.Tests
private Func<object> GetPropertyAccessor(Type type)
{
PropertyInfo propInfo = null;
for (var reflectionType = type;
for (Type reflectionType = type;
reflectionType != null;
reflectionType = reflectionType.GetTypeInfo().BaseType)
{

16
tests/ImageSharp.Tests/TestUtilities/Attributes/WithMemberFactoryAttribute.cs

@ -33,19 +33,19 @@ namespace ImageSharp.Tests
protected override object[] GetFactoryMethodArgs(MethodInfo testMethod, Type factoryType)
{
var m = testMethod.DeclaringType.GetMethod(this.memberMethodName);
MethodInfo m = testMethod.DeclaringType.GetMethod(this.memberMethodName);
var args = factoryType.GetGenericArguments();
var colorType = args.Single();
Type[] args = factoryType.GetGenericArguments();
Type colorType = args.Single();
var imgType = typeof(Image<>).MakeGenericType(colorType);
var genericFactoryType = (typeof(GenericFactory<>)).MakeGenericType(colorType);
Type imgType = typeof(Image<>).MakeGenericType(colorType);
Type genericFactoryType = (typeof(GenericFactory<>)).MakeGenericType(colorType);
var funcType = typeof(Func<,>).MakeGenericType(genericFactoryType, imgType);
Type funcType = typeof(Func<,>).MakeGenericType(genericFactoryType, imgType);
var genericMethod = m.MakeGenericMethod(args);
MethodInfo genericMethod = m.MakeGenericMethod(args);
var d = genericMethod.CreateDelegate(funcType);
Delegate d = genericMethod.CreateDelegate(funcType);
return new object[] { d };
}

6
tests/ImageSharp.Tests/TestUtilities/ImageProviders/FileProvider.cs

@ -37,13 +37,13 @@ namespace ImageSharp.Tests
public override Image<TColor> GetImage()
{
var key = new Key(this.PixelType, this.filePath);
Key key = new Key(this.PixelType, this.filePath);
var cachedImage = cache.GetOrAdd(
Image<TColor> cachedImage = cache.GetOrAdd(
key,
fn =>
{
var testFile = TestFile.Create(this.filePath);
TestFile testFile = TestFile.Create(this.filePath);
return this.Factory.CreateImage(testFile.Bytes);
});

2
tests/ImageSharp.Tests/TestUtilities/ImageProviders/SolidProvider.cs

@ -38,7 +38,7 @@ namespace ImageSharp.Tests
public override Image<TColor> GetImage()
{
var image = base.GetImage();
Image<TColor> image = base.GetImage();
TColor color = default(TColor);
color.PackFromBytes(this.r, this.g, this.b, this.a);

4
tests/ImageSharp.Tests/TestUtilities/ImagingTestCaseUtility.cs

@ -81,11 +81,11 @@ namespace ImageSharp.Tests
{
string path = this.GetTestOutputFileName(extension);
var format = GetImageFormatByExtension(extension);
IImageFormat format = GetImageFormatByExtension(extension);
encoder = encoder ?? format.Encoder;
using (var stream = File.OpenWrite(path))
using (FileStream stream = File.OpenWrite(path))
{
image.Save(stream, encoder, options);
}

10
tests/ImageSharp.Tests/TestUtilities/TestUtilityExtensions.cs

@ -33,7 +33,7 @@ namespace ImageSharp.Tests
foreach (PixelTypes pt in AllConcretePixelTypes.Where(pt => pt != PixelTypes.StandardImageClass))
{
string typeName = $"{nameSpace}.{pt.ToString()}";
var t = ImageSharpAssembly.GetType(typeName);
Type t = ImageSharpAssembly.GetType(typeName);
if (t == null)
{
throw new InvalidOperationException($"Could not find: {typeName}");
@ -58,16 +58,16 @@ namespace ImageSharp.Tests
byte[] bytesA = new byte[3];
byte[] bytesB = new byte[3];
using (var pixA = a.Lock())
using (PixelAccessor<TColor> pixA = a.Lock())
{
using (var pixB = b.Lock())
using (PixelAccessor<TColor> pixB = b.Lock())
{
for (int y = 0; y < a.Height; y++)
{
for (int x = 0; x < a.Width; x++)
{
var ca = pixA[x, y];
var cb = pixB[x, y];
TColor ca = pixA[x, y];
TColor cb = pixB[x, y];
if (compareAlpha)
{

20
tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs

@ -24,7 +24,7 @@ namespace ImageSharp.Tests
public void Use_WithEmptyImageAttribute<TColor>(TestImageProvider<TColor> provider, string message)
where TColor : struct, IPixel<TColor>
{
var img = provider.GetImage();
Image<TColor> img = provider.GetImage();
Assert.Equal(42, img.Width);
Assert.Equal(666, img.Height);
@ -38,7 +38,7 @@ namespace ImageSharp.Tests
string message)
where TColor : struct, IPixel<TColor>
{
var img = provider.GetImage();
Image<TColor> img = provider.GetImage();
Assert.Equal(42, img.Width);
Assert.Equal(666, img.Height);
@ -62,7 +62,7 @@ namespace ImageSharp.Tests
TestImageProvider<TColor> provider)
where TColor : struct, IPixel<TColor>
{
var img = provider.GetImage();
Image<TColor> img = provider.GetImage();
Assert.IsType<Image>(img);
}
@ -74,7 +74,7 @@ namespace ImageSharp.Tests
where TColor : struct, IPixel<TColor>
{
Assert.NotNull(provider.Utility.SourceFileOrDescription);
var img = provider.GetImage();
Image<TColor> img = provider.GetImage();
Assert.True(img.Width * img.Height > 0);
Assert.Equal(88, yo);
@ -91,7 +91,7 @@ namespace ImageSharp.Tests
where TColor : struct, IPixel<TColor>
{
Assert.NotNull(provider.Utility.SourceFileOrDescription);
var image = provider.GetImage();
Image<TColor> image = provider.GetImage();
provider.Utility.SaveTestOutputFile(image, "png");
}
@ -100,13 +100,13 @@ namespace ImageSharp.Tests
public void Use_WithSolidFilledImagesAttribute<TColor>(TestImageProvider<TColor> provider)
where TColor : struct, IPixel<TColor>
{
var img = provider.GetImage();
Image<TColor> img = provider.GetImage();
Assert.Equal(img.Width, 10);
Assert.Equal(img.Height, 20);
byte[] colors = new byte[4];
using (var pixels = img.Lock())
using (PixelAccessor<TColor> pixels = img.Lock())
{
for (int y = 0; y < pixels.Height; y++)
{
@ -140,7 +140,7 @@ namespace ImageSharp.Tests
public void Use_WithMemberFactoryAttribute<TColor>(TestImageProvider<TColor> provider)
where TColor : struct, IPixel<TColor>
{
var img = provider.GetImage();
Image<TColor> img = provider.GetImage();
Assert.Equal(img.Width, 3);
if (provider.PixelType == PixelTypes.StandardImageClass)
{
@ -162,7 +162,7 @@ namespace ImageSharp.Tests
public void Blank_MemberData<TColor>(TestImageProvider<TColor> provider)
where TColor : struct, IPixel<TColor>
{
var img = provider.GetImage();
Image<TColor> img = provider.GetImage();
Assert.True(img.Width * img.Height > 0);
}
@ -183,7 +183,7 @@ namespace ImageSharp.Tests
this.Output.WriteLine("SRC: " + provider.Utility.SourceFileOrDescription);
this.Output.WriteLine("OUT: " + provider.Utility.GetTestOutputFileName());
var img = provider.GetImage();
Image<TColor> img = provider.GetImage();
Assert.True(img.Width * img.Height > 0);
}

18
tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs

@ -28,7 +28,7 @@ namespace ImageSharp.Tests
{
Image<TColor> image = factory.CreateImage(10, 10);
using (var pixels = image.Lock())
using (PixelAccessor<TColor> pixels = image.Lock())
{
for (int i = 0; i < 10; i++)
{
@ -51,10 +51,10 @@ namespace ImageSharp.Tests
[Fact]
public void Baz()
{
var type = typeof(Color).GetTypeInfo().Assembly.GetType("ImageSharp.Color");
Type type = typeof(Color).GetTypeInfo().Assembly.GetType("ImageSharp.Color");
this.Output.WriteLine(type.ToString());
var fake = typeof(Color).GetTypeInfo().Assembly.GetType("ImageSharp.dsaada_DASqewrr");
Type fake = typeof(Color).GetTypeInfo().Assembly.GetType("ImageSharp.dsaada_DASqewrr");
Assert.Null(fake);
}
@ -64,8 +64,8 @@ namespace ImageSharp.Tests
public void IsEquivalentTo_WhenFalse<TColor>(TestImageProvider<TColor> provider, bool compareAlpha)
where TColor : struct, IPixel<TColor>
{
var a = provider.GetImage();
var b = provider.GetImage();
Image<TColor> a = provider.GetImage();
Image<TColor> b = provider.GetImage();
b = b.OilPaint(3, 2);
Assert.False(a.IsEquivalentTo(b, compareAlpha));
@ -77,8 +77,8 @@ namespace ImageSharp.Tests
public void IsEquivalentTo_WhenTrue<TColor>(TestImageProvider<TColor> provider, bool compareAlpha)
where TColor : struct, IPixel<TColor>
{
var a = provider.GetImage();
var b = provider.GetImage();
Image<TColor> a = provider.GetImage();
Image<TColor> b = provider.GetImage();
Assert.True(a.IsEquivalentTo(b, compareAlpha));
}
@ -114,7 +114,7 @@ namespace ImageSharp.Tests
{
PixelTypes pixelTypes = PixelTypes.Alpha8 | PixelTypes.Bgr565 | PixelTypes.Color | PixelTypes.HalfVector2 | PixelTypes.StandardImageClass;
var expanded = pixelTypes.ExpandAllTypes();
IEnumerable<KeyValuePair<PixelTypes, Type>> expanded = pixelTypes.ExpandAllTypes();
Assert.Equal(expanded.Count(), 5);
@ -128,7 +128,7 @@ namespace ImageSharp.Tests
[Fact]
public void ToTypes_All()
{
var expanded = PixelTypes.All.ExpandAllTypes().ToArray();
KeyValuePair<PixelTypes, Type>[] expanded = PixelTypes.All.ExpandAllTypes().ToArray();
Assert.True(expanded.Length >= TestUtilityExtensions.GetAllPixelTypes().Length - 2);
AssertContainsPixelType<Color>(PixelTypes.Color, expanded);

Loading…
Cancel
Save