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

Update refs to latest

src/Directory.Build.props

@@ -20,6 +20,10 @@
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <UseImageSharp>true</UseImageSharp>
+  </PropertyGroup>
 
   <ItemGroup>
     <!-- DynamicProxyGenAssembly2 is needed so Moq can use our internals -->

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.0" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
+    <PackageReference Include="SixLabors.Fonts" Version="2.0.1" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.0" />
   </ItemGroup>
   <Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />
 </Project>

src/ImageSharp.Drawing/Processing/GradientBrush.cs

@@ -4,6 +4,7 @@
 using System.Numerics;
 using SixLabors.ImageSharp.Drawing.Utilities;
 using SixLabors.ImageSharp.Memory;
+using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Drawing.Processing;
 

tests/Directory.Build.props

@@ -16,4 +16,8 @@
   <!-- Import the solution .props file. -->
   <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
 
+  <PropertyGroup>
+    <UseImageSharp>true</UseImageSharp>
+  </PropertyGroup>
+
 </Project>

tests/ImageSharp.Drawing.Tests/ConfigurationTests.cs

@@ -18,7 +18,7 @@ public class ConfigurationTests
 
     public Configuration DefaultConfiguration { get; }
 
-    private readonly int expectedDefaultConfigurationCount = 8;
+    private readonly int expectedDefaultConfigurationCount = 9;
 
     public ConfigurationTests()
     {

tests/ImageSharp.Drawing.Tests/Processing/BaseImageOperationsExtensionTest.cs

@@ -33,7 +33,7 @@ public BaseImageOperationsExtensionTest()
         this.shapeOptions = new ShapeOptions { IntersectionRule = IntersectionRule.NonZero };
         this.source = new Image<Rgba32>(91 + 324, 123 + 56);
         this.rect = new Rectangle(91, 123, 324, 56); // make this random?
-        this.internalOperations = new FakeImageOperationsProvider.FakeImageOperations<Rgba32>(this.source.GetConfiguration(), this.source, false);
+        this.internalOperations = new FakeImageOperationsProvider.FakeImageOperations<Rgba32>(this.source.Configuration, this.source, false);
         this.internalOperations.SetShapeOptions(this.shapeOptions);
         this.internalOperations.SetGraphicsOptions(this.graphicsOptions);
         this.operations = this.internalOperations;

tests/ImageSharp.Drawing.Tests/Processing/FillPathProcessorTests.cs

@@ -33,7 +33,7 @@ public void FillOffCanvas()
         var options = new GraphicsOptions { Antialias = true };
         var processor = new FillPathProcessor(new DrawingOptions() { GraphicsOptions = options }, brush.Object, path);
         var img = new Image<Rgba32>(10, 10);
-        processor.Execute(img.GetConfiguration(), img, bounds);
+        processor.Execute(img.Configuration, img, bounds);
     }
 
     [Fact]

tests/ImageSharp.Drawing.Tests/TestFileSystem.cs

@@ -8,45 +8,49 @@ namespace SixLabors.ImageSharp.Drawing.Tests;
 /// </summary>
 public class TestFileSystem : IO.IFileSystem
 {
-    private readonly Dictionary<string, Stream> fileSystem = new(StringComparer.OrdinalIgnoreCase);
+    private readonly Dictionary<string, Func<Stream>> fileSystem = new(StringComparer.OrdinalIgnoreCase);
 
-    public void AddFile(string path, Stream data)
+    public void AddFile(string path, Func<Stream> data)
     {
         lock (this.fileSystem)
         {
             this.fileSystem.Add(path, data);
         }
     }
 
-    public Stream Create(string path)
+    public Stream Create(string path) => this.GetStream(path) ?? File.Create(path);
+
+    public Stream CreateAsynchronous(string path) => this.GetStream(path) ?? File.Open(path, new FileStreamOptions
     {
-        // if we have injected a fake file use it instead
-        lock (this.fileSystem)
-        {
-            if (this.fileSystem.ContainsKey(path))
-            {
-                Stream stream = this.fileSystem[path];
-                stream.Position = 0;
-                return stream;
-            }
-        }
+        Mode = FileMode.Create,
+        Access = FileAccess.ReadWrite,
+        Share = FileShare.None,
+        Options = FileOptions.Asynchronous,
+    });
 
-        return File.Create(path);
-    }
+    public Stream OpenRead(string path) => this.GetStream(path) ?? File.OpenRead(path);
+
+    public Stream OpenReadAsynchronous(string path) => this.GetStream(path) ?? File.Open(path, new FileStreamOptions
+    {
+        Mode = FileMode.Open,
+        Access = FileAccess.Read,
+        Share = FileShare.Read,
+        Options = FileOptions.Asynchronous,
+    });
 
-    public Stream OpenRead(string path)
+    private Stream? GetStream(string path)
     {
         // if we have injected a fake file use it instead
         lock (this.fileSystem)
         {
-            if (this.fileSystem.ContainsKey(path))
+            if (this.fileSystem.TryGetValue(path, out Func<Stream>? streamFactory))
             {
-                Stream stream = this.fileSystem[path];
+                Stream stream = streamFactory();
                 stream.Position = 0;
                 return stream;
             }
         }
 
-        return File.OpenRead(path);
+        return null;
     }
 }

tests/ImageSharp.Drawing.Tests/TestUtilities/ImageComparison/ExactImageComparer.cs

@@ -28,7 +28,7 @@ public override ImageSimilarityReport<TPixelA, TPixelB> CompareImagesOrFrames<TP
         var bBuffer = new Rgba64[width];
 
         var differences = new List<PixelDifference>();
-        Configuration configuration = expected.GetConfiguration();
+        Configuration configuration = expected.Configuration;
         Buffer2D<TPixelA> expectedBuffer = expected.PixelBuffer;
         Buffer2D<TPixelB> actualBuffer = actual.PixelBuffer;
 

tests/ImageSharp.Drawing.Tests/TestUtilities/ImageComparison/TolerantImageComparer.cs

@@ -70,7 +70,7 @@ public override ImageSimilarityReport<TPixelA, TPixelB> CompareImagesOrFrames<TP
         float totalDifference = 0F;
 
         var differences = new List<PixelDifference>();
-        Configuration configuration = expected.GetConfiguration();
+        Configuration configuration = expected.Configuration;
         Buffer2D<TPixelA> expectedBuffer = expected.PixelBuffer;
         Buffer2D<TPixelB> actualBuffer = actual.PixelBuffer;
 

tests/ImageSharp.Drawing.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs

@@ -45,7 +45,7 @@ internal static unsafe Image<TPixel> From32bppArgbSystemDrawingBitmap<TPixel>(Bi
             long sourceRowByteCount = data.Stride;
             long destRowByteCount = w * sizeof(Bgra32);
 
-            Configuration configuration = image.GetConfiguration();
+            Configuration configuration = image.Configuration;
             image.ProcessPixelRows(accessor =>
             {
                 using IMemoryOwner<Bgra32> workBuffer = Configuration.Default.MemoryAllocator.Allocate<Bgra32>(w);
@@ -104,7 +104,7 @@ internal static unsafe Image<TPixel> From24bppRgbSystemDrawingBitmap<TPixel>(Bit
             long sourceRowByteCount = data.Stride;
             long destRowByteCount = w * sizeof(Bgr24);
 
-            Configuration configuration = image.GetConfiguration();
+            Configuration configuration = image.Configuration;
             Buffer2D<TPixel> imageBuffer = image.GetRootFramePixelBuffer();
 
             using IMemoryOwner<Bgr24> workBuffer = Configuration.Default.MemoryAllocator.Allocate<Bgr24>(w);
@@ -132,7 +132,7 @@ internal static unsafe Image<TPixel> From24bppRgbSystemDrawingBitmap<TPixel>(Bit
     internal static unsafe Bitmap To32bppArgbSystemDrawingBitmap<TPixel>(Image<TPixel> image)
         where TPixel : unmanaged, IPixel<TPixel>
     {
-        Configuration configuration = image.GetConfiguration();
+        Configuration configuration = image.Configuration;
         int w = image.Width;
         int h = image.Height;
 
@@ -147,7 +147,7 @@ internal static unsafe Bitmap To32bppArgbSystemDrawingBitmap<TPixel>(Image<TPixe
             long sourceRowByteCount = w * sizeof(Bgra32);
             image.ProcessPixelRows(accessor =>
             {
-                using IMemoryOwner<Bgra32> workBuffer = image.GetConfiguration().MemoryAllocator.Allocate<Bgra32>(w);
+                using IMemoryOwner<Bgra32> workBuffer = image.Configuration.MemoryAllocator.Allocate<Bgra32>(w);
                 fixed (Bgra32* sourcePtr = &workBuffer.GetReference())
                 {
                     for (int y = 0; y < h; y++)

tests/ImageSharp.Drawing.Tests/TestUtilities/Tests/TestImageProviderTests.cs

@@ -346,8 +346,8 @@ private static void EnsureCustomConfigurationIsApplied<TPixel>(TestImageProvider
             using (Image<TPixel> image2 = provider.GetImage())
             using (Image<TPixel> image3 = provider.GetImage())
             {
-                Assert.Same(customConfiguration, image2.GetConfiguration());
-                Assert.Same(customConfiguration, image3.GetConfiguration());
+                Assert.Same(customConfiguration, image2.Configuration);
+                Assert.Same(customConfiguration, image3.Configuration);
             }
         }
     }