-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add Matrix3x2 transform methods (#48195)
* Add Matrix3x2 transform methods This implements #47940 for System.Drawing.Common. * Move GdipGetWorldTransform into try block. * Fix build issues * Add workaround to nuget issue Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com>
- Loading branch information
1 parent
1e1b5cf
commit 667b4e7
Showing
12 changed files
with
256 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
src/libraries/System.Drawing.Common/tests/Drawing2D/MatrixTests.Core.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System.Numerics; | ||
| using Xunit; | ||
|
|
||
| namespace System.Drawing.Drawing2D.Tests | ||
| { | ||
| public partial class MatrixTests | ||
| { | ||
| [ConditionalTheory(Helpers.IsDrawingSupported)] | ||
| [MemberData(nameof(MatrixElements_TestData))] | ||
| public void Ctor_Matrix3x2(float m11, float m12, float m21, float m22, float dx, float dy, bool isIdentity, bool isInvertible) | ||
| { | ||
| Matrix3x2 matrix3X2 = new Matrix3x2(m11, m12, m21, m22, dx, dy); | ||
| using (var matrix = new Matrix(matrix3X2)) | ||
| { | ||
| Assert.Equal(new float[] { m11, m12, m21, m22, dx, dy }, matrix.Elements); | ||
| Assert.Equal(matrix3X2, matrix.MatrixElements); | ||
| Assert.Equal(isIdentity, matrix.IsIdentity); | ||
| Assert.Equal(isInvertible, matrix.IsInvertible); | ||
| Assert.Equal(dx, matrix.OffsetX); | ||
| Assert.Equal(dy, matrix.OffsetY); | ||
| } | ||
| } | ||
|
|
||
| [ConditionalTheory(Helpers.IsDrawingSupported)] | ||
| [MemberData(nameof(MatrixElements_TestData))] | ||
| public void MatrixElements_RoundTrip(float m11, float m12, float m21, float m22, float dx, float dy, bool isIdentity, bool isInvertible) | ||
| { | ||
| Matrix3x2 matrix3X2 = new Matrix3x2(m11, m12, m21, m22, dx, dy); | ||
| using (var matrix = new Matrix()) | ||
| { | ||
| matrix.MatrixElements = matrix3X2; | ||
| Assert.Equal(new float[] { m11, m12, m21, m22, dx, dy }, matrix.Elements); | ||
| Assert.Equal(matrix3X2, matrix.MatrixElements); | ||
| Assert.Equal(isIdentity, matrix.IsIdentity); | ||
| Assert.Equal(isInvertible, matrix.IsInvertible); | ||
| Assert.Equal(dx, matrix.OffsetX); | ||
| Assert.Equal(dy, matrix.OffsetY); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
src/libraries/System.Drawing.Common/tests/GraphicsTests.Core.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System.Drawing.Drawing2D; | ||
| using System.Numerics; | ||
| using Xunit; | ||
|
|
||
| namespace System.Drawing.Tests | ||
| { | ||
| public partial class GraphicsTests | ||
| { | ||
| private static Matrix3x2 s_testMatrix = Matrix3x2.CreateRotation(45) * Matrix3x2.CreateScale(2) * Matrix3x2.CreateTranslation(new Vector2(10, 20)); | ||
|
|
||
|
|
||
| [ConditionalFact(Helpers.IsDrawingSupported)] | ||
| public void TransformElements_SetNonInvertibleMatrix_ThrowsArgumentException() | ||
| { | ||
| using (var image = new Bitmap(5, 5)) | ||
| using (Graphics graphics = Graphics.FromImage(image)) | ||
| { | ||
| Matrix3x2 matrix = new Matrix3x2(123, 24, 82, 16, 47, 30); | ||
| AssertExtensions.Throws<ArgumentException>(null, () => graphics.TransformElements = matrix); | ||
| } | ||
| } | ||
|
|
||
| [ActiveIssue("https://github.com/dotnet/runtime/issues/22221", TestPlatforms.AnyUnix)] | ||
| [ConditionalFact(Helpers.IsDrawingSupported)] | ||
| public void TransformElements_GetSetWhenBusy_ThrowsInvalidOperationException() | ||
| { | ||
| using (var image = new Bitmap(10, 10)) | ||
| using (Graphics graphics = Graphics.FromImage(image)) | ||
| { | ||
| graphics.GetHdc(); | ||
| try | ||
| { | ||
| Assert.Throws<InvalidOperationException>(() => graphics.TransformElements); | ||
| Assert.Throws<InvalidOperationException>(() => graphics.TransformElements = Matrix3x2.Identity); | ||
| } | ||
| finally | ||
| { | ||
| graphics.ReleaseHdc(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| [ConditionalFact(Helpers.IsDrawingSupported)] | ||
| public void TransformElements_GetSetWhenDisposed_ThrowsArgumentException() | ||
| { | ||
| using (var image = new Bitmap(10, 10)) | ||
| { | ||
| Graphics graphics = Graphics.FromImage(image); | ||
| graphics.Dispose(); | ||
|
|
||
| AssertExtensions.Throws<ArgumentException>(null, () => graphics.TransformElements); | ||
| AssertExtensions.Throws<ArgumentException>(null, () => graphics.TransformElements = Matrix3x2.Identity); | ||
| } | ||
| } | ||
|
|
||
| [ConditionalFact(Helpers.IsDrawingSupported)] | ||
| public void TransformElements_RoundTrip() | ||
| { | ||
| using (var image = new Bitmap(10, 10)) | ||
| using (Graphics graphics = Graphics.FromImage(image)) | ||
| { | ||
| graphics.TransformElements = s_testMatrix; | ||
| Assert.Equal(s_testMatrix, graphics.TransformElements); | ||
|
|
||
| using (Matrix matrix = graphics.Transform) | ||
| { | ||
| Assert.Equal(s_testMatrix, matrix.MatrixElements); | ||
| } | ||
|
|
||
| using (Matrix matrix = new Matrix()) | ||
| { | ||
| graphics.Transform = matrix; | ||
| Assert.True(graphics.TransformElements.IsIdentity); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.