diff --git a/src/ImageSharp/Processing/AffineTransformBuilder.cs b/src/ImageSharp/Processing/AffineTransformBuilder.cs
index 75f23c6b4..ed3483dc4 100644
--- a/src/ImageSharp/Processing/AffineTransformBuilder.cs
+++ b/src/ImageSharp/Processing/AffineTransformBuilder.cs
@@ -31,7 +31,7 @@ namespace SixLabors.ImageSharp.Processing
/// The amount of rotation, in radians.
/// The .
public AffineTransformBuilder PrependRotationRadians(float radians)
- => this.Prepend(size => TransformUtilities.CreateRotationMatrixRadians(radians, size));
+ => this.Prepend(size => TransformUtils.CreateRotationMatrixRadians(radians, size));
///
/// Prepends a rotation matrix using the given rotation in degrees at the given origin.
@@ -67,7 +67,7 @@ namespace SixLabors.ImageSharp.Processing
/// The amount of rotation, in radians.
/// The .
public AffineTransformBuilder AppendRotationRadians(float radians)
- => this.Append(size => TransformUtilities.CreateRotationMatrixRadians(radians, size));
+ => this.Append(size => TransformUtils.CreateRotationMatrixRadians(radians, size));
///
/// Appends a rotation matrix using the given rotation in degrees at the given origin.
@@ -142,7 +142,7 @@ namespace SixLabors.ImageSharp.Processing
/// The Y angle, in degrees.
/// The .
public AffineTransformBuilder PrependSkewDegrees(float degreesX, float degreesY)
- => this.Prepend(size => TransformUtilities.CreateSkewMatrixDegrees(degreesX, degreesY, size));
+ => this.Prepend(size => TransformUtils.CreateSkewMatrixDegrees(degreesX, degreesY, size));
///
/// Prepends a centered skew matrix from the give angles in radians.
@@ -151,7 +151,7 @@ namespace SixLabors.ImageSharp.Processing
/// The Y angle, in radians.
/// The .
public AffineTransformBuilder PrependSkewRadians(float radiansX, float radiansY)
- => this.Prepend(size => TransformUtilities.CreateSkewMatrixRadians(radiansX, radiansY, size));
+ => this.Prepend(size => TransformUtils.CreateSkewMatrixRadians(radiansX, radiansY, size));
///
/// Prepends a skew matrix using the given angles in degrees at the given origin.
@@ -180,7 +180,7 @@ namespace SixLabors.ImageSharp.Processing
/// The Y angle, in degrees.
/// The .
public AffineTransformBuilder AppendSkewDegrees(float degreesX, float degreesY)
- => this.Append(size => TransformUtilities.CreateSkewMatrixDegrees(degreesX, degreesY, size));
+ => this.Append(size => TransformUtils.CreateSkewMatrixDegrees(degreesX, degreesY, size));
///
/// Appends a centered skew matrix from the give angles in radians.
@@ -189,7 +189,7 @@ namespace SixLabors.ImageSharp.Processing
/// The Y angle, in radians.
/// The .
public AffineTransformBuilder AppendSkewRadians(float radiansX, float radiansY)
- => this.Append(size => TransformUtilities.CreateSkewMatrixRadians(radiansX, radiansY, size));
+ => this.Append(size => TransformUtils.CreateSkewMatrixRadians(radiansX, radiansY, size));
///
/// Appends a skew matrix using the given angles in degrees at the given origin.
@@ -314,7 +314,7 @@ namespace SixLabors.ImageSharp.Processing
private static void CheckDegenerate(Matrix3x2 matrix)
{
- if (TransformUtilities.IsDegenerate(matrix))
+ if (TransformUtils.IsDegenerate(matrix))
{
throw new DegenerateTransformException("Matrix is degenerate. Check input values.");
}
diff --git a/src/ImageSharp/Processing/Extensions/Transforms/TransformExtensions.cs b/src/ImageSharp/Processing/Extensions/Transforms/TransformExtensions.cs
index 15430b28f..57acf78ee 100644
--- a/src/ImageSharp/Processing/Extensions/Transforms/TransformExtensions.cs
+++ b/src/ImageSharp/Processing/Extensions/Transforms/TransformExtensions.cs
@@ -52,7 +52,7 @@ namespace SixLabors.ImageSharp.Processing
IResampler sampler)
{
Matrix3x2 transform = builder.BuildMatrix(sourceRectangle);
- Size targetDimensions = TransformUtilities.GetTransformedSize(sourceRectangle.Size, transform);
+ Size targetDimensions = TransformUtils.GetTransformedSize(sourceRectangle.Size, transform);
return ctx.Transform(sourceRectangle, transform, targetDimensions, sampler);
}
@@ -116,7 +116,7 @@ namespace SixLabors.ImageSharp.Processing
IResampler sampler)
{
Matrix4x4 transform = builder.BuildMatrix(sourceRectangle);
- Size targetDimensions = TransformUtilities.GetTransformedSize(sourceRectangle.Size, transform);
+ Size targetDimensions = TransformUtils.GetTransformedSize(sourceRectangle.Size, transform);
return ctx.Transform(sourceRectangle, transform, targetDimensions, sampler);
}
diff --git a/src/ImageSharp/Processing/Processors/Transforms/Linear/ProjectiveTransformProcessor{TPixel}.cs b/src/ImageSharp/Processing/Processors/Transforms/Linear/ProjectiveTransformProcessor{TPixel}.cs
index 811bb1a88..f16a495b1 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/Linear/ProjectiveTransformProcessor{TPixel}.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/Linear/ProjectiveTransformProcessor{TPixel}.cs
@@ -139,7 +139,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
for (int x = 0; x < this.maxX; x++)
{
- Vector2 point = TransformUtilities.ProjectiveTransform2D(x, y, this.matrix);
+ Vector2 point = TransformUtils.ProjectiveTransform2D(x, y, this.matrix);
int px = (int)MathF.Round(point.X);
int py = (int)MathF.Round(point.Y);
@@ -206,7 +206,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
{
// Use the single precision position to calculate correct bounding pixels
// otherwise we get rogue pixels outside of the bounds.
- Vector2 point = TransformUtilities.ProjectiveTransform2D(x, y, this.matrix);
+ Vector2 point = TransformUtils.ProjectiveTransform2D(x, y, this.matrix);
LinearTransformUtils.Convolve(
in this.sampler,
point,
diff --git a/src/ImageSharp/Processing/Processors/Transforms/Linear/RotateProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/Linear/RotateProcessor.cs
index 3b4604075..641466847 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/Linear/RotateProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/Linear/RotateProcessor.cs
@@ -28,14 +28,14 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
/// The source image size
public RotateProcessor(float degrees, IResampler sampler, Size sourceSize)
: this(
- TransformUtilities.CreateRotationMatrixDegrees(degrees, sourceSize),
+ TransformUtils.CreateRotationMatrixDegrees(degrees, sourceSize),
sampler,
sourceSize)
=> this.Degrees = degrees;
// Helper constructor
private RotateProcessor(Matrix3x2 rotationMatrix, IResampler sampler, Size sourceSize)
- : base(rotationMatrix, sampler, TransformUtilities.GetTransformedSize(sourceSize, rotationMatrix))
+ : base(rotationMatrix, sampler, TransformUtils.GetTransformedSize(sourceSize, rotationMatrix))
{
}
diff --git a/src/ImageSharp/Processing/Processors/Transforms/Linear/SkewProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/Linear/SkewProcessor.cs
index e5791b82f..0d82d145e 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/Linear/SkewProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/Linear/SkewProcessor.cs
@@ -30,7 +30,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
/// The source image size
public SkewProcessor(float degreesX, float degreesY, IResampler sampler, Size sourceSize)
: this(
- TransformUtilities.CreateSkewMatrixDegrees(degreesX, degreesY, sourceSize),
+ TransformUtils.CreateSkewMatrixDegrees(degreesX, degreesY, sourceSize),
sampler,
sourceSize)
{
@@ -40,7 +40,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
// Helper constructor:
private SkewProcessor(Matrix3x2 skewMatrix, IResampler sampler, Size sourceSize)
- : base(skewMatrix, sampler, TransformUtilities.GetTransformedSize(sourceSize, skewMatrix))
+ : base(skewMatrix, sampler, TransformUtils.GetTransformedSize(sourceSize, skewMatrix))
{
}
diff --git a/src/ImageSharp/Processing/Processors/Transforms/TransformUtilities.cs b/src/ImageSharp/Processing/Processors/Transforms/TransformUtils.cs
similarity index 99%
rename from src/ImageSharp/Processing/Processors/Transforms/TransformUtilities.cs
rename to src/ImageSharp/Processing/Processors/Transforms/TransformUtils.cs
index 2b4c2ff14..a92aa54a5 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/TransformUtilities.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/TransformUtils.cs
@@ -10,7 +10,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
///
/// Contains utility methods for working with transforms.
///
- internal static class TransformUtilities
+ internal static class TransformUtils
{
///
/// Returns a value that indicates whether the specified matrix is degenerate
diff --git a/src/ImageSharp/Processing/ProjectiveTransformBuilder.cs b/src/ImageSharp/Processing/ProjectiveTransformBuilder.cs
index d81ce2890..d1469d43e 100644
--- a/src/ImageSharp/Processing/ProjectiveTransformBuilder.cs
+++ b/src/ImageSharp/Processing/ProjectiveTransformBuilder.cs
@@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.Processing
/// The amount to taper.
/// The .
public ProjectiveTransformBuilder PrependTaper(TaperSide side, TaperCorner corner, float fraction)
- => this.Prepend(size => TransformUtilities.CreateTaperMatrix(size, side, corner, fraction));
+ => this.Prepend(size => TransformUtils.CreateTaperMatrix(size, side, corner, fraction));
///
/// Appends a matrix that performs a tapering projective transform.
@@ -34,7 +34,7 @@ namespace SixLabors.ImageSharp.Processing
/// The amount to taper.
/// The .
public ProjectiveTransformBuilder AppendTaper(TaperSide side, TaperCorner corner, float fraction)
- => this.Append(size => TransformUtilities.CreateTaperMatrix(size, side, corner, fraction));
+ => this.Append(size => TransformUtils.CreateTaperMatrix(size, side, corner, fraction));
///
/// Prepends a centered rotation matrix using the given rotation in degrees.
@@ -50,7 +50,7 @@ namespace SixLabors.ImageSharp.Processing
/// The amount of rotation, in radians.
/// The .
public ProjectiveTransformBuilder PrependRotationRadians(float radians)
- => this.Prepend(size => new Matrix4x4(TransformUtilities.CreateRotationMatrixRadians(radians, size)));
+ => this.Prepend(size => new Matrix4x4(TransformUtils.CreateRotationMatrixRadians(radians, size)));
///
/// Prepends a centered rotation matrix using the given rotation in degrees at the given origin.
@@ -84,7 +84,7 @@ namespace SixLabors.ImageSharp.Processing
/// The amount of rotation, in radians.
/// The .
public ProjectiveTransformBuilder AppendRotationRadians(float radians)
- => this.Append(size => new Matrix4x4(TransformUtilities.CreateRotationMatrixRadians(radians, size)));
+ => this.Append(size => new Matrix4x4(TransformUtils.CreateRotationMatrixRadians(radians, size)));
///
/// Appends a centered rotation matrix using the given rotation in degrees at the given origin.
@@ -168,7 +168,7 @@ namespace SixLabors.ImageSharp.Processing
/// The Y angle, in radians.
/// The .
public ProjectiveTransformBuilder PrependSkewRadians(float radiansX, float radiansY)
- => this.Prepend(size => new Matrix4x4(TransformUtilities.CreateSkewMatrixRadians(radiansX, radiansY, size)));
+ => this.Prepend(size => new Matrix4x4(TransformUtils.CreateSkewMatrixRadians(radiansX, radiansY, size)));
///
/// Prepends a skew matrix using the given angles in degrees at the given origin.
@@ -206,7 +206,7 @@ namespace SixLabors.ImageSharp.Processing
/// The Y angle, in radians.
/// The .
public ProjectiveTransformBuilder AppendSkewRadians(float radiansX, float radiansY)
- => this.Append(size => new Matrix4x4(TransformUtilities.CreateSkewMatrixRadians(radiansX, radiansY, size)));
+ => this.Append(size => new Matrix4x4(TransformUtils.CreateSkewMatrixRadians(radiansX, radiansY, size)));
///
/// Appends a skew matrix using the given angles in degrees at the given origin.
@@ -332,7 +332,7 @@ namespace SixLabors.ImageSharp.Processing
private static void CheckDegenerate(Matrix4x4 matrix)
{
- if (TransformUtilities.IsDegenerate(matrix))
+ if (TransformUtils.IsDegenerate(matrix))
{
throw new DegenerateTransformException("Matrix is degenerate. Check input values.");
}
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/TransformBuilderTestBase.cs b/tests/ImageSharp.Tests/Processing/Transforms/TransformBuilderTestBase.cs
index 4306732e8..2e0dfd59e 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/TransformBuilderTestBase.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/TransformBuilderTestBase.cs
@@ -99,7 +99,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
this.AppendRotationDegrees(builder, degrees);
// TODO: We should also test CreateRotationMatrixDegrees() (and all TransformUtils stuff!) for correctness
- Matrix3x2 matrix = TransformUtilities.CreateRotationMatrixDegrees(degrees, size);
+ Matrix3x2 matrix = TransformUtils.CreateRotationMatrixDegrees(degrees, size);
var position = new Vector2(x, y);
var expected = Vector2.Transform(position, matrix);
@@ -153,7 +153,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
this.AppendSkewDegrees(builder, degreesX, degreesY);
- Matrix3x2 matrix = TransformUtilities.CreateSkewMatrixDegrees(degreesX, degreesY, size);
+ Matrix3x2 matrix = TransformUtils.CreateSkewMatrixDegrees(degreesX, degreesY, size);
var position = new Vector2(x, y);
var expected = Vector2.Transform(position, matrix);