Merge pull request #358 from SixLabors/js/v4-refs-update

Update references

Author: JimBobSquarePants

.github/workflows/build-and-test.yml

@@ -71,8 +71,10 @@ jobs:
 
     steps:
       - name: Install libgdi+, which is required for tests running on ubuntu
-        if: ${{ matrix.options.os == 'buildjet-4vcpu-ubuntu-2204-arm' }}
-        run: sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
+        if: ${{ contains(matrix.options.os, 'ubuntu') }}
+        run: |
+            sudo apt-get update
+            sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
 
       - name: Git Config
         shell: bash

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.9" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="4.0.0-alpha.0.18" />
+    <PackageReference Include="SixLabors.Fonts" Version="2.1.3" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="4.0.0-alpha.0.26" />
   </ItemGroup>
   <Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />
 </Project>

src/ImageSharp.Drawing/Processing/Processors/Drawing/FillPathProcessor{TPixel}.cs

@@ -56,7 +56,7 @@ protected override void OnFrameApply(ImageFrame<TPixel> source)
         }
 
         // Align start/end positions.
-        Rectangle interest = Rectangle.Intersect(this.bounds, source.Bounds());
+        Rectangle interest = Rectangle.Intersect(this.bounds, source.Bounds);
         if (interest.Equals(Rectangle.Empty))
         {
             return; // No effect inside image;

src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor{TPixel}.cs

@@ -26,7 +26,7 @@ public FillProcessor(Configuration configuration, FillProcessor definition, Imag
     /// <inheritdoc/>
     protected override void OnFrameApply(ImageFrame<TPixel> source)
     {
-        Rectangle interest = Rectangle.Intersect(this.SourceRectangle, source.Bounds());
+        Rectangle interest = Rectangle.Intersect(this.SourceRectangle, source.Bounds);
         if (interest.Width == 0 || interest.Height == 0)
         {
             return;

tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs

@@ -269,7 +269,7 @@ public void FontShapesAreRenderedCorrectly_LargeText<TPixel>(
         string str = Repeat(" ", 78) + "THISISTESTWORDSTHISISTESTWORDSTHISISTESTWORDSTHISISTESTWORDSTHISISTESTWORDS";
         sb.Append(str);
 
-        string newLines = Repeat("\r\n", 31);
+        string newLines = Repeat("\r\n", 61);
         sb.Append(newLines);
 
         for (int i = 0; i < 10; i++)