Browse Source

Update dependencies

pull/775/head
James Jackson-South 7 years ago
parent
commit
ffba817bca
  1. 4
      src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
  2. 2
      src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CIeLchToCieLabConverter.cs
  3. 2
      src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLabToCieLchConverter.cs
  4. 2
      src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLchuvToCieLuvConverter.cs
  5. 2
      src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLuvToCieLchuvConverter.cs
  6. 2
      src/ImageSharp/ImageSharp.csproj
  7. 4
      src/ImageSharp/Processing/AffineTransformBuilder.cs
  8. 2
      src/ImageSharp/Processing/KnownFilterMatrices.cs
  9. 9
      src/ImageSharp/Processing/ProjectiveTransformBuilder.cs
  10. 10
      tests/ImageSharp.Tests/Processing/Transforms/TransformBuilderTestBase.cs

4
src/ImageSharp.Drawing/ImageSharp.Drawing.csproj

@ -38,8 +38,8 @@
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="..\..\stylecop.json" />
<PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta0007" />
<PackageReference Include="SixLabors.Shapes" Version="1.0.0-beta0007" />
<PackageReference Include="SixLabors.Fonts" Version="1.0.0-dev000119" />
<PackageReference Include="SixLabors.Shapes" Version="1.0.0-dev000102" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta007">
<PrivateAssets>All</PrivateAssets>
</PackageReference>

2
src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CIeLchToCieLabConverter.cs

@ -22,7 +22,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
// Conversion algorithm described here:
// https://en.wikipedia.org/wiki/Lab_color_space#Cylindrical_representation:_CIELCh_or_CIEHLC
float l = input.L, c = input.C, hDegrees = input.H;
float hRadians = MathFExtensions.DegreeToRadian(hDegrees);
float hRadians = GeometryUtilities.DegreeToRadian(hDegrees);
float a = c * MathF.Cos(hRadians);
float b = c * MathF.Sin(hRadians);

2
src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLabToCieLchConverter.cs

@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
float l = input.L, a = input.A, b = input.B;
float c = MathF.Sqrt((a * a) + (b * b));
float hRadians = MathF.Atan2(b, a);
float hDegrees = MathFExtensions.RadianToDegree(hRadians);
float hDegrees = GeometryUtilities.RadianToDegree(hRadians);
// Wrap the angle round at 360.
hDegrees %= 360;

2
src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLchuvToCieLuvConverter.cs

@ -22,7 +22,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
// Conversion algorithm described here:
// https://en.wikipedia.org/wiki/CIELUV#Cylindrical_representation_.28CIELCH.29
float l = input.L, c = input.C, hDegrees = input.H;
float hRadians = MathFExtensions.DegreeToRadian(hDegrees);
float hRadians = GeometryUtilities.DegreeToRadian(hDegrees);
float u = c * MathF.Cos(hRadians);
float v = c * MathF.Sin(hRadians);

2
src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLuvToCieLchuvConverter.cs

@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
float l = input.L, a = input.U, b = input.V;
float c = MathF.Sqrt((a * a) + (b * b));
float hRadians = MathF.Atan2(b, a);
float hDegrees = MathFExtensions.RadianToDegree(hRadians);
float hDegrees = GeometryUtilities.RadianToDegree(hRadians);
// Wrap the angle round at 360.
hDegrees %= 360;

2
src/ImageSharp/ImageSharp.csproj

@ -42,7 +42,7 @@
<ItemGroup>
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.1" />
<PackageReference Include="SixLabors.Core" Version="1.0.0-beta0006" />
<PackageReference Include="SixLabors.Core" Version="1.0.0-dev000089" />
<AdditionalFiles Include="..\..\stylecop.json" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta007">
<PrivateAssets>All</PrivateAssets>

4
src/ImageSharp/Processing/AffineTransformBuilder.cs

@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.Processing
/// <param name="degrees">The amount of rotation, in degrees.</param>
/// <returns>The <see cref="AffineTransformBuilder"/>.</returns>
public AffineTransformBuilder PrependRotationDegrees(float degrees)
=> this.PrependRotationRadians(MathFExtensions.DegreeToRadian(degrees));
=> this.PrependRotationRadians(GeometryUtilities.DegreeToRadian(degrees));
/// <summary>
/// Appends a rotation matrix using the given rotation angle in degrees
@ -68,7 +68,7 @@ namespace SixLabors.ImageSharp.Processing
/// <param name="degrees">The amount of rotation, in degrees.</param>
/// <returns>The <see cref="AffineTransformBuilder"/>.</returns>
public AffineTransformBuilder AppendRotationDegrees(float degrees)
=> this.AppendRotationRadians(MathFExtensions.DegreeToRadian(degrees));
=> this.AppendRotationRadians(GeometryUtilities.DegreeToRadian(degrees));
/// <summary>
/// Prepends a scale matrix from the given uniform scale.

2
src/ImageSharp/Processing/KnownFilterMatrices.cs

@ -322,7 +322,7 @@ namespace SixLabors.ImageSharp.Processing
degrees += 360;
}
float radian = MathFExtensions.DegreeToRadian(degrees);
float radian = GeometryUtilities.DegreeToRadian(degrees);
float cosRadian = MathF.Cos(radian);
float sinRadian = MathF.Sin(radian);

9
src/ImageSharp/Processing/ProjectiveTransformBuilder.cs

@ -114,7 +114,7 @@ namespace SixLabors.ImageSharp.Processing
/// <param name="degrees">The amount of rotation, in degrees.</param>
/// <returns>The <see cref="AffineTransformBuilder"/>.</returns>
public ProjectiveTransformBuilder PrependCenteredRotationDegrees(float degrees)
=> this.PrependRotationRadians(MathFExtensions.DegreeToRadian(degrees));
=> this.PrependRotationRadians(GeometryUtilities.DegreeToRadian(degrees));
/// <summary>
/// Appends a centered rotation matrix using the given rotation in degrees.
@ -122,7 +122,7 @@ namespace SixLabors.ImageSharp.Processing
/// <param name="degrees">The amount of rotation, in degrees.</param>
/// <returns>The <see cref="AffineTransformBuilder"/>.</returns>
public ProjectiveTransformBuilder AppendRotationDegrees(float degrees)
=> this.AppendRotationRadians(MathFExtensions.DegreeToRadian(degrees));
=> this.AppendRotationRadians(GeometryUtilities.DegreeToRadian(degrees));
/// <summary>
/// Prepends a scale matrix from the given uniform scale.
@ -247,10 +247,5 @@ namespace SixLabors.ImageSharp.Processing
return matrix;
}
/// <summary>
/// Removes all matrices from the builder.
/// </summary>
public void Clear() => this.matrices.Clear();
}
}

10
tests/ImageSharp.Tests/Processing/Transforms/TransformBuilderTestBase.cs

@ -3,8 +3,6 @@
using System;
using System.Numerics;
using SixLabors.ImageSharp.Processing;
using SixLabors.ImageSharp.Processing.Processors.Transforms;
using SixLabors.Primitives;
@ -128,7 +126,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
var centerPoint = new Vector2(cx, cy);
this.AppendRotationDegrees(builder, deg, centerPoint);
var matrix = Matrix3x2.CreateRotation(ImageMaths.DegreesToRadians(deg), centerPoint);
var matrix = Matrix3x2.CreateRotation(GeometryUtilities.DegreeToRadian(deg), centerPoint);
var position = new Vector2(x, y);
var expected = Vector2.Transform(position, matrix);
@ -195,13 +193,13 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
protected abstract void PrependRotationRadians(TBuilder b1, float v, Vector2 vector2);
protected virtual void AppendRotationDegrees(TBuilder builder, float degrees) =>
this.AppendRotationRadians(builder, ImageMaths.DegreesToRadians(degrees));
this.AppendRotationRadians(builder, GeometryUtilities.DegreeToRadian(degrees));
protected virtual void AppendRotationDegrees(TBuilder builder, float degrees, Vector2 center) =>
this.AppendRotationRadians(builder, ImageMaths.DegreesToRadians(degrees), center);
this.AppendRotationRadians(builder, GeometryUtilities.DegreeToRadian(degrees), center);
protected abstract Vector2 Execute(TBuilder builder, Rectangle rectangle, Vector2 sourcePoint);
private static float Sqrt(float a) => (float)Math.Sqrt(a);
}
}
Loading…
Cancel
Save