diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index acb057b..d663c65 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
WebDoorCreator - Egalware
- Version: 0.9.2308.0109
+ Version: 0.9.2308.0111
Release note:
-
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 9d47aac..7a91c1c 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2308.0109
+0.9.2308.0111
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index e7c46c2..01638eb 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 0.9.2308.0109
+ 0.9.2308.0111
http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip
http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html
false
diff --git a/WebDoorCreator.API/Controllers/DoorImageController.cs b/WebDoorCreator.API/Controllers/DoorImageController.cs
index b66fca6..fc1d63c 100644
--- a/WebDoorCreator.API/Controllers/DoorImageController.cs
+++ b/WebDoorCreator.API/Controllers/DoorImageController.cs
@@ -1,8 +1,14 @@
using Microsoft.AspNetCore.Mvc;
using NLog;
+using SkiaSharp;
using Svg;
+using Svg.Skia;
using System.Drawing;
using WebDoorCreator.Data.Services;
+#if false
+using SkiaSharp;
+using Svg.Skia;
+#endif
namespace WebDoorCreator.API.Controllers
{
@@ -31,6 +37,7 @@ namespace WebDoorCreator.API.Controllers
return "OK";
}
+
[HttpGet("GetImage.png")]
public async Task GetImagePng(int DoorId)
{
@@ -38,10 +45,27 @@ namespace WebDoorCreator.API.Controllers
string svgContent = await QDataServ.DoorGetLastSvg(DoorId);
if (!string.IsNullOrEmpty(svgContent))
{
- var mySvg = SvgDocument.FromSvg(svgContent);
- //result = System.Text.Encoding.UTF8.GetBytes(svgContent);
- var myBmp = mySvg.Draw();
- result = ImageToByte2(myBmp);
+ using (var svg = new SKSvg())
+ {
+ if (svg.FromSvg(svgContent) is { })
+ {
+ using (var stream = new MemoryStream())
+ {
+ svg.Picture?.ToImage(stream, SKColors.Empty, SKEncodedImageFormat.Png, 100, 1f, 1f, SKColorType.Rgba8888, SKAlphaType.Unpremul, SKColorSpace.CreateSrgb());
+ result = stream.ToArray();
+ }
+ }
+ }
+#if false
+ var mySvg = SvgDocument.FromSvg(svgContent);
+ //result = System.Text.Encoding.UTF8.GetBytes(svgContent);
+ var myBmp = mySvg.Draw();
+ using (var stream = new MemoryStream())
+ {
+ img.Save(stream, System.Drawing.Imaging.ImageFormat.Png);
+ result= stream.ToArray();
+ }
+#endif
}
return File(result, "image/png");
}
@@ -72,14 +96,6 @@ namespace WebDoorCreator.API.Controllers
#region Private Methods
- private byte[] ImageToByte2(Image img)
- {
- using (var stream = new MemoryStream())
- {
- img.Save(stream, System.Drawing.Imaging.ImageFormat.Png);
- return stream.ToArray();
- }
- }
#endregion Private Methods
diff --git a/WebDoorCreator.API/WebDoorCreator.API.csproj b/WebDoorCreator.API/WebDoorCreator.API.csproj
index 53a3359..ab17ace 100644
--- a/WebDoorCreator.API/WebDoorCreator.API.csproj
+++ b/WebDoorCreator.API/WebDoorCreator.API.csproj
@@ -20,11 +20,13 @@
+
+
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index befbed7..4488073 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 0.9.2308.0109
+ 0.9.2308.0111
enable
aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608