Merge pull request #335 from SixLabors/js/update-refs

Update references and fix casting of RichTextRuns
SixLabors · Jul 22, 2024 · b4a25da · b4a25da
2 parents db32b13 + b7dfb7f
commit b4a25da
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 14 deletions.
diff --git a/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
@@ -45,8 +45,8 @@
     <None Include="..\..\shared-infrastructure\branding\icons\imagesharp.drawing\sixlabors.imagesharp.drawing.128.png" Pack="true" PackagePath="" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="SixLabors.Fonts" Version="2.0.3" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
+    <PackageReference Include="SixLabors.Fonts" Version="2.0.4" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
   </ItemGroup>
   <Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />
 </Project>
diff --git a/src/ImageSharp.Drawing/Processing/RichTextOptions.cs b/src/ImageSharp.Drawing/Processing/RichTextOptions.cs
@@ -16,8 +16,7 @@ public class RichTextOptions : TextOptions
     /// <param name="font">The font.</param>
     public RichTextOptions(Font font)
         : base(font)
-    {
-    }
+        => this.TextRuns = Array.Empty<RichTextRun>();
 
     /// <summary>
     /// Initializes a new instance of the <see cref="RichTextOptions" /> class from properties

diff --git a/tests/ImageSharp.Drawing.Tests/Issues/Issue_332.cs b/tests/ImageSharp.Drawing.Tests/Issues/Issue_332.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Six Labors.
+// Licensed under the Six Labors Split License.
+
+using SixLabors.Fonts;
+using SixLabors.ImageSharp.Drawing.Processing;
+
+namespace SixLabors.ImageSharp.Drawing.Tests.Issues;
+
+public class Issue_332
+{
+    [Fact]
+    public void CanAccessEmptyRichTextRuns()
+    {
+        Font font = TestFontUtilities.GetFont(TestFonts.OpenSans, 70);
+        RichTextOptions options = new(font);
+        Assert.Empty(options.TextRuns);
+    }
+}
diff --git a/...75_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(32)-A(75)-Quic).png b/...75_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(32)-A(75)-Quic).png
diff --git a/...75_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(40)-A(90)-Quic).png b/...75_Solid300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(40)-A(90)-Quic).png
diff --git a/...d300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(32)-A(75)-STR(1)-Quic).png b/...d300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(32)-A(75)-STR(1)-Quic).png
diff --git a/...d300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(40)-A(90)-STR(2)-Quic).png b/...d300x200_(255,255,255,255)_F(OpenSans-Regular.ttf)-S(40)-A(90)-STR(2)-Quic).png
diff --git a/...extOnImageTests/FallbackFontRendering_Rgba32_Solid400x200_(255,255,255,255).png b/...extOnImageTests/FallbackFontRendering_Rgba32_Solid400x200_(255,255,255,255).png