ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

ImageLoader

Browse source
This commit is contained in:
ClemensFischer 2025-09-03 22:03:20 +02:00
parent dfe3201625
commit 55d1ee933c
3 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
MapControl/Avalonia/ImageLoader.Avalonia.cs
View file

@ -12,7 +12,7 @@ namespace MapControl
{ {
public static IImage LoadImage(Uri uri) public static IImage LoadImage(Uri uri)
{ {
return null; throw new NotSupportedException();
} }
public static IImage LoadImage(Stream stream) public static IImage LoadImage(Stream stream)
@ -25,17 +25,19 @@ namespace MapControl
return Task.FromResult(LoadImage(stream)); return Task.FromResult(LoadImage(stream));
} }
public static Task<IImage> LoadImageAsync(string path) public static async Task<IImage> LoadImageAsync(string path)
{ {
if (!File.Exists(path)) IImage image = null;
if (File.Exists(path))
{ {
return Task.FromResult<IImage>(null); using (var stream = File.OpenRead(path))
{
image = await LoadImageAsync(stream);
}
} }
using (var stream = File.OpenRead(path)) return image;
{
return LoadImageAsync(stream);
}
} }
internal static async Task<IImage> LoadMergedImageAsync(Uri uri1, Uri uri2, IProgress<double> progress) internal static async Task<IImage> LoadMergedImageAsync(Uri uri1, Uri uri2, IProgress<double> progress)

16
MapControl/Shared/ImageLoader.cs
View file

@ -31,6 +31,14 @@ namespace MapControl
HttpClient.DefaultRequestHeaders.Add("User-Agent", $"XAML-Map-Control/{typeof(ImageLoader).Assembly.GetName().Version}"); HttpClient.DefaultRequestHeaders.Add("User-Agent", $"XAML-Map-Control/{typeof(ImageLoader).Assembly.GetName().Version}");
} }
public static async Task<ImageSource> LoadImageAsync(byte[] buffer)
{
using (var stream = new MemoryStream(buffer))
{
return await LoadImageAsync(stream);
}
}
public static async Task<ImageSource> LoadImageAsync(Uri uri, IProgress<double> progress = null) public static async Task<ImageSource> LoadImageAsync(Uri uri, IProgress<double> progress = null)
{ {
ImageSource image = null; ImageSource image = null;
@ -67,14 +75,6 @@ namespace MapControl
return image; return image;
} }
public static async Task<ImageSource> LoadImageAsync(byte[] buffer)
{
using (var stream = new MemoryStream(buffer))
{
return await LoadImageAsync(stream);
}
}
internal class HttpResponse internal class HttpResponse
{ {
public byte[] Buffer { get; } public byte[] Buffer { get; }

16
MapControl/WPF/ImageLoader.WPF.cs
View file

@ -32,17 +32,19 @@ namespace MapControl
return Task.FromResult(LoadImage(stream)); return Task.FromResult(LoadImage(stream));
} }
public static Task<ImageSource> LoadImageAsync(string path) public static async Task<ImageSource> LoadImageAsync(string path)
{ {
if (!File.Exists(path)) ImageSource image = null;
if (File.Exists(path))
{ {
return Task.FromResult<ImageSource>(null); using (var stream = File.OpenRead(path))
{
image = await LoadImageAsync(stream);
}
} }
using (var stream = File.OpenRead(path)) return image;
{
return LoadImageAsync(stream);
}
} }
internal static async Task<ImageSource> LoadMergedImageAsync(Uri uri1, Uri uri2, IProgress<double> progress) internal static async Task<ImageSource> LoadMergedImageAsync(Uri uri1, Uri uri2, IProgress<double> progress)