Update test refs and dependencies

JimBobSquarePants · JimBobSquarePants · commit 337d799f7254 · 2023-05-04T21:31:49.000+10:00
diff --git a/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
@@ -18,7 +18,7 @@
     <None Include="..\..\shared-infrastructure\branding\icons\imagesharp.drawing\sixlabors.imagesharp.drawing.128.png" Pack="true" PackagePath="" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta19.12" />
+    <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta19.13" />
     <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
   </ItemGroup>
   <Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />
diff --git a/tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs b/tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Numerics;
 using System.Text;
@@ -813,7 +812,8 @@ public void CanFillTextVertical<TPixel>(TestImageProvider<TPixel> provider)
 
             IPathCollection glyphs = TextBuilder.GenerateGlyphs(text, textOptions);
 
-            DrawingOptions options = new() { ShapeOptions = new() { IntersectionRule = IntersectionRule.Nonzero } };
+            // TODO: This still leaves some holes when overlaying the text (CFF NotoSansKRRegular only). We need to fix this.
+            DrawingOptions options = new() { ShapeOptions = new() { IntersectionRule = IntersectionRule.NonZero } };
 
             provider.RunValidatingProcessorTest(
                 c => c.Fill(Color.White).Fill(options, Color.Black, glyphs),
@@ -838,7 +838,9 @@ public void CanFillTextVerticalMixed<TPixel>(TestImageProvider<TPixel> provider)
             };
 
             IPathCollection glyphs = TextBuilder.GenerateGlyphs(text, textOptions);
-            DrawingOptions options = new() { ShapeOptions = new() { IntersectionRule = IntersectionRule.Nonzero } };
+
+            // TODO: This still leaves some holes when overlaying the text (CFF NotoSansKRRegular only). We need to fix this.
+            DrawingOptions options = new() { ShapeOptions = new() { IntersectionRule = IntersectionRule.NonZero } };
 
             provider.RunValidatingProcessorTest(
                 c => c.Fill(Color.White).Fill(options, Color.Black, glyphs),
diff --git a/tests/ImageSharp.Drawing.Tests/TestFonts.cs b/tests/ImageSharp.Drawing.Tests/TestFonts.cs
@@ -24,5 +24,7 @@ public static class TestFonts
         public const string NettoOffc = "NettoOffc.ttf";
 
         public const string NotoSansKRRegular = "NotoSansKR-Regular.otf";
+
+        public const string NotoSerifKRRegular = "NotoSerifKR-Regular.otf";
     }
 }
diff --git a/tests/ImageSharp.Drawing.Tests/TestFonts/NotoSerifKR-Regular.otf b/tests/ImageSharp.Drawing.Tests/TestFonts/NotoSerifKR-Regular.otf
diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawRichTextAlongPathHorizontal_Solid100x100_(0,0,0,255)_RichText-Path-(spiral).png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawRichTextAlongPathHorizontal_Solid100x100_(0,0,0,255)_RichText-Path-(spiral).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a283625897dca06bc6ab0b86fcf7dc12a6d45c0bdb0efc0322279005caa6a155
-size 4059
+oid sha256:622e2ff91e5d81bd5ebc9d3153411fc9dd7e5919cffada0dd578a7f08d3805c5
+size 4061
diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawRichTextAlongPathHorizontal_Solid120x120_(0,0,0,255)_RichText-Path-(triangle).png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawRichTextAlongPathHorizontal_Solid120x120_(0,0,0,255)_RichText-Path-(triangle).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80ae95eac176b05d46dfde034192f8227cb858d1a589bdd8bf4fdedd0360ff2c
-size 4413
+oid sha256:d9ebdbce65dc7a70a7e40cf0d1429e632033ffa2c9a1fc08b800f9fbf238180d
+size 4407
diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextVerticalMixed_Rgba32_Blank500x400.png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextVerticalMixed_Rgba32_Blank500x400.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29569a74f1404684476d37ca67fcd7daa68422f0c938fab18139ab55f574a711
+size 11603
diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextVertical_Rgba32_Blank500x400.png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanDrawTextVertical_Rgba32_Blank500x400.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:679288fecbf0d32962c2b734fb0c6750a1d22558f0e9346d7c59f548e7e0a77a
+size 10436
diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanFillTextVerticalMixed_Rgba32_Blank500x400.png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanFillTextVerticalMixed_Rgba32_Blank500x400.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bec3662a6fbeea032ebdb5b64d77a48d52187873a81eadbce0e65341bb82816a
+size 13648
diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanFillTextVertical_Rgba32_Blank500x400.png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/CanFillTextVertical_Rgba32_Blank500x400.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:05d7ba46f2431295ffc79c9ea7b62078b3aff3d2feeb22f4a169d94a8084891b
+size 14277
diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/DrawRichTextArabic_Solid500x200_(0,0,0,255)_RichText-Arabic-F(32).png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/DrawRichTextArabic_Solid500x200_(0,0,0,255)_RichText-Arabic-F(32).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e6340848cc2e402b71c54d5f7304e40de0e3581007e685dae8cb5ad021c3c90
-size 3120
+oid sha256:6686318fb7ec0e62ea17e888df24d3df20ccefb6d051517f7c1d0cd16ffdb1b3
+size 3141
diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/DrawRichTextArabic_Solid500x300_(0,0,0,255)_RichText-Arabic-F(40).png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/DrawRichTextArabic_Solid500x300_(0,0,0,255)_RichText-Arabic-F(40).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db3708b4743f502f2e142860b338b98bbc6e6c923f05254e95577d8e8284651a
-size 3981
+oid sha256:5776375e9e3e8411ee33880d9967a11bb7282544097784fd37fc962f0de93d9a
+size 3967
diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/DrawRichTextRainbow_Solid500x200_(0,0,0,255)_RichText-Rainbow-F(32).png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/DrawRichTextRainbow_Solid500x200_(0,0,0,255)_RichText-Rainbow-F(32).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35b076541af5caa5008284467cded08e92b071a681a9c4b345e8691dca89a26e
-size 9208
+oid sha256:7f46fa1683537573d40ecc5c4be6ed5bc4155a06b26441a096613a957ecafddd
+size 9724
diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/DrawRichTextRainbow_Solid500x300_(0,0,0,255)_RichText-Rainbow-F(40).png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/DrawRichTextRainbow_Solid500x300_(0,0,0,255)_RichText-Rainbow-F(40).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9724f8a8b3d0d3c154f0afcf5a59beed783efc528606d554d0608ff6074f9d0
-size 11812
+oid sha256:72b7e78efc1f80c19b706492ade3ce223ee171ea704fb440d18716672d1187f6
+size 12233
diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/DrawRichText_Solid500x200_(0,0,0,255)_RichText-F(32).png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/DrawRichText_Solid500x200_(0,0,0,255)_RichText-F(32).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d639bf8b4ed9ae43ee6db0de44340de09c71a7bdd59e43b1b133e823af1f5c9
-size 9659
+oid sha256:5b18683fd5f31fce4a7fcb99aa503c057ba79a8d1a47503bac0b7672a544ff7c
+size 9797
diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/DrawRichText_Solid500x300_(0,0,0,255)_RichText-F(40).png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/DrawRichText_Solid500x300_(0,0,0,255)_RichText-F(40).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d5bd5373e4084691e78516047e7b36b231a4baa7135daca1173f39643deb4c1
-size 12164
+oid sha256:f21bd4763ac4ac0695d24ef51cd86ffd82bbe621ed658d73da17fe5c9b2167da
+size 12358
diff --git a/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/EmojiFontRendering_Rgba32_Solid1276x336_(255,255,255,255)_ColorFontsEnabled-False.png b/tests/Images/ReferenceOutput/Drawing/Text/DrawTextOnImageTests/EmojiFontRendering_Rgba32_Solid1276x336_(255,255,255,255)_ColorFontsEnabled-False.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29398fc0b24a155743cd88549237059d1801d580eab54e0089e46493f843851e
-size 10140
+oid sha256:77ac3749de29456d1363ad1edc84e30cff3d5c0420016c3e53d7da0bc18e018b
+size 10075

Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,7 @@ public static class TestFonts`
`24`	`24`	`public const string NettoOffc = "NettoOffc.ttf";`
`25`	`25`
`26`	`26`	`public const string NotoSansKRRegular = "NotoSansKR-Regular.otf";`
	`27`	`+`
	`28`	`+ public const string NotoSerifKRRegular = "NotoSerifKR-Regular.otf";`
`27`	`29`	`}`
`28`	`30`	`}`