mirror of
https://github.com/ClemensFischer/XAML-Map-Control.git
synced 2025-12-06 07:12:04 +01:00
ImageLoader WPF, Avalonia
This commit is contained in:
parent
2c3bc4d7e6
commit
e520245d45
|
|
@ -4,7 +4,6 @@ using Avalonia.Media.Imaging;
|
||||||
using Avalonia.Platform;
|
using Avalonia.Platform;
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace MapControl
|
namespace MapControl
|
||||||
|
|
@ -23,9 +22,7 @@ namespace MapControl
|
||||||
|
|
||||||
public static Task<IImage> LoadImageAsync(Stream stream)
|
public static Task<IImage> LoadImageAsync(Stream stream)
|
||||||
{
|
{
|
||||||
return Thread.CurrentThread.IsThreadPoolThread ?
|
return Task.Run(() => LoadImage(stream));
|
||||||
Task.FromResult(LoadImage(stream)) :
|
|
||||||
Task.Run(() => LoadImage(stream));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async Task<IImage> LoadImageAsync(string path)
|
public static async Task<IImage> LoadImageAsync(string path)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
|
|
@ -30,9 +29,7 @@ namespace MapControl
|
||||||
|
|
||||||
public static Task<ImageSource> LoadImageAsync(Stream stream)
|
public static Task<ImageSource> LoadImageAsync(Stream stream)
|
||||||
{
|
{
|
||||||
return Thread.CurrentThread.IsThreadPoolThread ?
|
return Task.Run(() => LoadImage(stream));
|
||||||
Task.FromResult(LoadImage(stream)) :
|
|
||||||
Task.Run(() => LoadImage(stream));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async Task<ImageSource> LoadImageAsync(string path)
|
public static async Task<ImageSource> LoadImageAsync(string path)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue