From a78054fd141839d4b654457a2b623b7bed731fa8 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Wed, 8 Jan 2025 20:42:25 +1000 Subject: [PATCH 1/2] Update dependency references to latest releases. --- src/ImageSharp.Drawing/ImageSharp.Drawing.csproj | 4 ++-- .../Drawing/Text/DrawTextOnImageTests.cs | 2 +- ...extAlongPathVertical_Rgba32_Blank250x250_type-triangle.png | 4 ++-- ...wTextAlongPathVertical_Rgba32_Blank350x350_type-circle.png | 4 ++-- .../CanDrawTextVerticalMixed_Rgba32_Blank500x400.png | 4 ++-- .../CanDrawTextVertical_Rgba32_Blank500x400.png | 4 ++-- .../CanFillTextVerticalMixed_Rgba32_Blank500x400.png | 4 ++-- .../CanFillTextVertical_Rgba32_Blank500x400.png | 4 ++-- ...255,255,255)_F(OpenSans-Regular.ttf)-S(32)-A(75)-Quic).png | 4 ++-- ...,255)_F(OpenSans-Regular.ttf)-S(32)-A(75)-STR(1)-Quic).png | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj index 44e9ed38..1d286e25 100644 --- a/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj +++ b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj @@ -45,8 +45,8 @@ - - + + \ No newline at end of file diff --git a/tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs b/tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs index b5d26e27..34f4278c 100644 --- a/tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs +++ b/tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs @@ -269,7 +269,7 @@ public void FontShapesAreRenderedCorrectly_LargeText( string str = Repeat(" ", 78) + "THISISTESTWORDSTHISISTESTWORDSTHISISTESTWORDSTHISISTESTWORDSTHISISTESTWORDS"; sb.Append(str); - string newLines = Repeat(Environment.NewLine, 61); + string newLines = Repeat(Environment.NewLine, 31); sb.Append(newLines); for (int i = 0; i < 10; i++) diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextAlongPathVertical_Rgba32_Blank250x250_type-triangle.png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextAlongPathVertical_Rgba32_Blank250x250_type-triangle.png index 092fd0b7..2a7dc8b2 100644 --- a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextAlongPathVertical_Rgba32_Blank250x250_type-triangle.png +++ b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextAlongPathVertical_Rgba32_Blank250x250_type-triangle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cea2edbeb61434012966d82f2b3907a7ec9182e937aba5279acf1771b01de91 -size 5380 +oid sha256:d01cd317d93f6119434f3eb2794bbbc4531d9565ff6ae6589de10aff56ec1541 +size 5346 diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextAlongPathVertical_Rgba32_Blank350x350_type-circle.png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextAlongPathVertical_Rgba32_Blank350x350_type-circle.png index 5e035a9b..5045119f 100644 --- a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextAlongPathVertical_Rgba32_Blank350x350_type-circle.png +++ b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextAlongPathVertical_Rgba32_Blank350x350_type-circle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3052ecfcec07b8067fa56d91227a7354427f4fc8daa5785664d4df5345853e12 -size 7550 +oid sha256:4de98e29b8a63ec12041f55f64d08361d78968d20feb16389d14a5c0ed3ba325 +size 7414 diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextVerticalMixed_Rgba32_Blank500x400.png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextVerticalMixed_Rgba32_Blank500x400.png index d9c16030..1b377121 100644 --- a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextVerticalMixed_Rgba32_Blank500x400.png +++ b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextVerticalMixed_Rgba32_Blank500x400.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84e47aac0a9fb574e4140ec75e03bb11ca7b3fbdf7cc39989703f4bdef6a27de -size 9504 +oid sha256:cfa1c0c0c65831499867466b8b3ac7d0402ea89fba93af2e58283c8d293108b1 +size 10180 diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextVertical_Rgba32_Blank500x400.png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextVertical_Rgba32_Blank500x400.png index d7ed4103..8569fe5b 100644 --- a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextVertical_Rgba32_Blank500x400.png +++ b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextVertical_Rgba32_Blank500x400.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7531c53a3babe5243374f582bc79330aa663e49b1d5158e635b18801d2093d1 -size 4695 +oid sha256:6a42eb1279a508cda6a6791bda68bb03136acec6e20e55c69d53f249d0efe9c3 +size 4460 diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanFillTextVerticalMixed_Rgba32_Blank500x400.png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanFillTextVerticalMixed_Rgba32_Blank500x400.png index a90dae41..8bf1f4c2 100644 --- a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanFillTextVerticalMixed_Rgba32_Blank500x400.png +++ b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanFillTextVerticalMixed_Rgba32_Blank500x400.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:000526fbe95e5ce84144cb933a36c0272b886bb7cbc79684389e2c6fa9755038 -size 9645 +oid sha256:cdcba4f5713dd1678ec57f5dd97fca793f8d062677f0282c9ea6abfcad946ec7 +size 11460 diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanFillTextVertical_Rgba32_Blank500x400.png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanFillTextVertical_Rgba32_Blank500x400.png index d5b7018b..2585e4e8 100644 --- a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanFillTextVertical_Rgba32_Blank500x400.png +++ b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanFillTextVertical_Rgba32_Blank500x400.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68bc96ce74e742708f84391387c879c915acd576d334346b2d32b1990058b505 -size 4743 +oid sha256:780093fabb4f665498adcddde53635cd68502341f8ff2a9fe66cf105a47e9af7 +size 4524 diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanRotateFilledFont_Issue175_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(32)-A(75)-Quic).png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanRotateFilledFont_Issue175_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(32)-A(75)-Quic).png index b3ab8340..7350227e 100644 --- a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanRotateFilledFont_Issue175_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(32)-A(75)-Quic).png +++ b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanRotateFilledFont_Issue175_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(32)-A(75)-Quic).png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a519106bb39b4ec9c569fe43cb0c63ef46808c29ffb3f172b4db9a93f4faf9f4 -size 1962 +oid sha256:ea80289164c0b4d68d822bb8bfd2909222802ec4212bbbfc5f3d52be04196063 +size 1972 diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanRotateOutlineFont_Issue175_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(32)-A(75)-STR(1)-Quic).png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanRotateOutlineFont_Issue175_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(32)-A(75)-STR(1)-Quic).png index fbc985ab..a650fcf5 100644 --- a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanRotateOutlineFont_Issue175_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(32)-A(75)-STR(1)-Quic).png +++ b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanRotateOutlineFont_Issue175_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(32)-A(75)-STR(1)-Quic).png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82fd62a3b4080137e31a23a4485b467b2804313fb57455017f1ef11de1d38e5e -size 2595 +oid sha256:01215cf82da27254b5d9e720eb9db7bc7988d7c305d0c26245a7398a5411738c +size 2636 From 913d63dd47873a4a23d9cb1ba3b87d5a8e23d87e Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Wed, 8 Jan 2025 20:58:01 +1000 Subject: [PATCH 2/2] Use consistent line ending. --- .../Drawing/Text/DrawTextOnImageTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs b/tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs index 34f4278c..75e8641b 100644 --- a/tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs +++ b/tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs @@ -269,7 +269,7 @@ public void FontShapesAreRenderedCorrectly_LargeText( string str = Repeat(" ", 78) + "THISISTESTWORDSTHISISTESTWORDSTHISISTESTWORDSTHISISTESTWORDSTHISISTESTWORDS"; sb.Append(str); - string newLines = Repeat(Environment.NewLine, 31); + string newLines = Repeat("\r\n", 31); sb.Append(newLines); for (int i = 0; i < 10; i++)