From be4c8a2e64bb948ee962032ffcf09b67c3ad3ad9 Mon Sep 17 00:00:00 2001 From: Brychan Dempsey Date: Mon, 18 Oct 2021 12:05:45 +1300 Subject: [PATCH] Merged image loading from MainWindow in server context --- PDGServer_WPF/App.xaml.cs | 2 +- PDGServer_WPF/ConnectionPage.xaml | 4 +- PDGServer_WPF/ConnectionPage.xaml.cs | 100 ++++++++++++++++++++++++++- 3 files changed, 102 insertions(+), 4 deletions(-) diff --git a/PDGServer_WPF/App.xaml.cs b/PDGServer_WPF/App.xaml.cs index 06ee999..a2b6928 100644 --- a/PDGServer_WPF/App.xaml.cs +++ b/PDGServer_WPF/App.xaml.cs @@ -57,7 +57,7 @@ namespace RBG_Server } - void LoadStream(Stream source, string path, bool isSprite) + public void LoadStream(Stream source, string path, bool isSprite) { long srcStart = source.Position; byte[] vs = new byte[6]; // First 6 bytes is the gif specifier diff --git a/PDGServer_WPF/ConnectionPage.xaml b/PDGServer_WPF/ConnectionPage.xaml index f2d28f3..e25e0ca 100644 --- a/PDGServer_WPF/ConnectionPage.xaml +++ b/PDGServer_WPF/ConnectionPage.xaml @@ -13,7 +13,7 @@