Merge branch 'master' into branch

This commit is contained in:
Cinder Roxley
2024-11-01 13:59:24 -05:00
9 changed files with 153 additions and 15 deletions

View File

@@ -28,6 +28,7 @@
using System;
using System.Threading;
using CoreJ2K;
using CoreJ2K.j2k.util;
using SkiaSharp;
namespace OpenMetaverse.TestClient
@@ -150,7 +151,8 @@ namespace OpenMetaverse.TestClient
bitmap = scaledImage;
}
}
uploadData = J2kImage.ToBytes(bitmap);
uploadData = Imaging.J2K.ToBytes(bitmap);
}
catch (Exception ex)
{

View File

@@ -16,7 +16,7 @@
<ProjectReference Include="..\..\..\LibreMetaverse.Voice.Vivox\LibreMetaverse.Voice.Vivox.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Pfim" Version="0.11.2" />
<PackageReference Include="Pfim" Version="0.11.3" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.8" />
<PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="2.88.8" />
<PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="2.88.8" />