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

Update Fonts to v2.0.3 and ImageSharp to v3.1.4
SixLabors · Apr 15, 2024 · c8ae268 · c8ae268
2 parents 6b62e73 + 6bca16c
commit c8ae268
Show file tree

Hide file tree

Showing 6 changed files with 14 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.1" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.3" />
+    <PackageReference Include="SixLabors.Fonts" Version="2.0.3" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
   </ItemGroup>
   <Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />
 </Project>
diff --git a/tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs b/tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs
@@ -451,8 +451,8 @@ public void CanRotateFilledFont_Issue175<TPixel>(
         AffineTransformBuilder builder = new AffineTransformBuilder().AppendRotationDegrees(angle);
 
         RichTextOptions textOptions = new(font);
-        FontRectangle bounds = TextMeasurer.MeasureSize(text, textOptions);
-        Matrix3x2 transform = builder.BuildMatrix(Rectangle.Round(new RectangleF(bounds.X, bounds.Y, bounds.Width, bounds.Height)));
+        FontRectangle advance = TextMeasurer.MeasureAdvance(text, textOptions);
+        Matrix3x2 transform = builder.BuildMatrix(Rectangle.Round(new RectangleF(advance.X, advance.Y, advance.Width, advance.Height)));
 
         provider.RunValidatingProcessorTest(
             x => x.SetDrawingTransform(transform).DrawText(textOptions, text, Color.Black),
@@ -478,8 +478,8 @@ public void CanRotateOutlineFont_Issue175<TPixel>(
         AffineTransformBuilder builder = new AffineTransformBuilder().AppendRotationDegrees(angle);
 
         RichTextOptions textOptions = new(font);
-        FontRectangle bounds = TextMeasurer.MeasureSize(text, textOptions);
-        Matrix3x2 transform = builder.BuildMatrix(Rectangle.Round(new RectangleF(bounds.X, bounds.Y, bounds.Width, bounds.Height)));
+        FontRectangle advance = TextMeasurer.MeasureAdvance(text, textOptions);
+        Matrix3x2 transform = builder.BuildMatrix(Rectangle.Round(new RectangleF(advance.X, advance.Y, advance.Width, advance.Height)));
 
         provider.RunValidatingProcessorTest(
             x => x.SetDrawingTransform(transform)

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