ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-04-04 14:08:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Version 4.10.0: Updated target framework versions. Cleanup of TypeConverters, ImageLoader, MBTileSource.

Browse source
This commit is contained in:
ClemensF 2018-08-16 19:43:16 +02:00
parent bdcd2597a1
commit 25cc04e2f2
5 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@ namespace MapControl
{
public static partial class ImageLoader
{
public static ImageSource CreateImageSource(Stream stream)
public static ImageSource LoadImage(Stream stream)
{
var bitmapImage = new BitmapImage();
bitmapImage.BeginInit();
@ -28,31 +28,31 @@ namespace MapControl
return bitmapImage;
}
public static Task<ImageSource> CreateImageSourceAsync(Stream stream)
public static Task<ImageSource> LoadImageAsync(Stream stream)
{
return Task.Run(() => CreateImageSource(stream));
return Task.Run(() => LoadImage(stream));
}
public static ImageSource CreateImageSource(byte[] buffer)
public static ImageSource LoadImage(byte[] buffer)
{
using (var stream = new MemoryStream(buffer))
{
return CreateImageSource(stream);
return LoadImage(stream);
}
}
public static Task<ImageSource> CreateImageSourceAsync(byte[] buffer)
public static Task<ImageSource> LoadImageAsync(byte[] buffer)
{
return Task.Run(() => CreateImageSource(buffer));
return Task.Run(() => LoadImage(buffer));
}
private static async Task<ImageSource> CreateImageSourceAsync(HttpContent content)
private static async Task<ImageSource> LoadImageAsync(HttpContent content)
{
using (var stream = new MemoryStream())
{
await content.CopyToAsync(stream);
stream.Seek(0, SeekOrigin.Begin);
return await CreateImageSourceAsync(stream);
return await LoadImageAsync(stream);
}
}
@ -65,7 +65,7 @@ namespace MapControl
{
using (var stream = File.OpenRead(path))
{
imageSource = CreateImageSource(stream);
imageSource = LoadImage(stream);
}
}

2
MapControl/WPF/TileImageLoader.WPF.cs
View file

@ -67,7 +67,7 @@ namespace MapControl
private void SetTileImage(Tile tile, Stream stream)
{
var imageSource = ImageLoader.CreateImageSource(stream);
var imageSource = ImageLoader.LoadImage(stream);
tile.Image.Dispatcher.InvokeAsync(() => tile.SetImage(imageSource));
}