Update Dependencies (#1007)

* update: Avalonia, Avalonia.Desktop, Avalonia.Diagnostics, Avalonia.ReactiveUI, Avalonia.Themes.Fluent * update: OpenTelemetry, OpenTelemetry.Exporter.Console, OpenTelemetry.Exporter.Zipkin * update: Serilog.Sinks.Async, Serilog.Sinks.File * update: OpenCvSharp4, OpenCvSharp4.runtime.win
b-editor · Jun 24, 2024 · b64e72f · b64e72f
1 parent b865a3b
commit b64e72f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,13 +4,13 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AsyncImageLoader.Avalonia" Version="3.2.1" />
-    <PackageVersion Include="Avalonia" Version="11.0.10" />
+    <PackageVersion Include="Avalonia" Version="11.0.11" />
     <PackageVersion Include="Avalonia.Controls.PanAndZoom" Version="11.0.0.3" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.0.10" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.0.11" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.11" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.0.11" />
     <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.18" />
-    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.0.10" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.0.11" />
     <PackageVersion Include="Avalonia.Xaml.Behaviors" Version="11.0.10.9" />
     <PackageVersion Include="Avalonia.Xaml.Interactivity" Version="11.0.10.9" />
     <PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
@@ -51,22 +51,22 @@
     <PackageVersion Include="Nuke.Common" Version="8.0.0" />
     <PackageVersion Include="NUnit" Version="4.1.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageVersion Include="OpenCvSharp4" Version="4.9.0.20240103" />
+    <PackageVersion Include="OpenCvSharp4" Version="4.10.0.20240616" />
     <PackageVersion Include="OpenCvSharp4.runtime.osx.10.15-x64" Version="4.6.0.20230105" />
     <PackageVersion Include="OpenCvSharp4.runtime.osx_arm64" Version="4.8.1-rc" />
-    <PackageVersion Include="OpenCvSharp4.runtime.win" Version="4.9.0.20240103" />
-    <PackageVersion Include="OpenTelemetry" Version="1.8.1" />
-    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.8.1" />
-    <PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.8.1" />
+    <PackageVersion Include="OpenCvSharp4.runtime.win" Version="4.10.0.20240616" />
+    <PackageVersion Include="OpenTelemetry" Version="1.9.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.9.0" />
     <PackageVersion Include="OpenTK.OpenAL" Version="5.0.0-pre.8" />
     <PackageVersion Include="OpenTK.Windowing.GraphicsLibraryFramework" Version="5.0.0-pre.10" />
     <PackageVersion Include="PanelExtension" Version="1.0.0" />
     <PackageVersion Include="ReactiveProperty" Version="9.5.0" />
     <PackageVersion Include="Roslynator.Analyzers" Version="4.12.4" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
     <PackageVersion Include="Serilog.Sinks.Async" Version="2.0.0" />
-    <PackageVersion Include="Serilog.Sinks.Debug" Version="2.0.0" />
-    <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
+    <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageVersion Include="Serilog.Sinks.OpenTelemetry" Version="1.2.0" />
     <PackageVersion Include="SharpDX.Direct3D9" Version="4.2.0" />
     <PackageVersion Include="SharpDX.MediaFoundation" Version="4.2.0" />
@@ -81,4 +81,4 @@
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
     <PackageVersion Include="Vortice.XAudio2" Version="3.5.0" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Beutl.Engine/Graphics/Image.cs b/src/Beutl.Engine/Graphics/Image.cs
@@ -157,7 +157,7 @@ public static SKBitmap ToSKBitmap(this Mat self)
 
     public static Mat ToMat(this Bitmap<Bgra8888> self)
     {
-        return new Mat(self.Height, self.Width, MatType.CV_8UC4, self.Data);
+        return Mat.FromPixelData(self.Height, self.Width, MatType.CV_8UC4, self.Data);
     }
 
     internal static EncodedImageFormat ToImageFormat(string filename)

diff --git a/src/Beutl/Models/FrameCacheManager.CacheEntry.cs b/src/Beutl/Models/FrameCacheManager.CacheEntry.cs
@@ -99,7 +99,7 @@ private static unsafe Bitmap<Bgra8888> ToBitmap(Mat mat, int bottom, int right)
             else
             {
                 bitmap = new Bitmap<Bgra8888>(mat.Width, (int)(mat.Height / 1.5));
-                using var bgra = new Mat(bitmap.Height, bitmap.Width, MatType.CV_8UC4, bitmap.Data);
+                using var bgra = Mat.FromPixelData(bitmap.Height, bitmap.Width, MatType.CV_8UC4, bitmap.Data);
 
                 Cv2.CvtColor(mat, bgra, ColorConversionCodes.YUV2BGRA_I420);