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

Version 4.12. Added MapControl.Images project, fixed assembly signing

Browse source
This commit is contained in:
ClemensF 2018-12-09 17:14:32 +01:00
parent 3310f58912
commit ac26c57a81
22 changed files with 1015 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,14 +10,13 @@ using System.Linq;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading.Tasks;
using System.Windows.Media;
using System.Windows.Media.Imaging;
namespace MapControl
{
public static partial class ImageLoader
{
public static ImageSource LoadImage(Stream stream)
public static BitmapSource LoadImage(Stream stream)
{
var bitmapImage = new BitmapImage();
bitmapImage.BeginInit();
@ -28,12 +27,12 @@ namespace MapControl
return bitmapImage;
}
public static Task<ImageSource> LoadImageAsync(Stream stream)
public static Task<BitmapSource> LoadImageAsync(Stream stream)
{
return Task.Run(() => LoadImage(stream));
}
public static ImageSource LoadImage(byte[] buffer)
public static BitmapSource LoadImage(byte[] buffer)
{
using (var stream = new MemoryStream(buffer))
{
@ -41,12 +40,12 @@ namespace MapControl
}
}
public static Task<ImageSource> LoadImageAsync(byte[] buffer)
public static Task<BitmapSource> LoadImageAsync(byte[] buffer)
{
return Task.Run(() => LoadImage(buffer));
}
private static async Task<ImageSource> LoadImageAsync(HttpContent content)
private static async Task<BitmapSource> LoadImageAsync(HttpContent content)
{
using (var stream = new MemoryStream())
{
@ -56,23 +55,23 @@ namespace MapControl
}
}
private static ImageSource LoadLocalImage(Uri uri)
private static BitmapSource LoadLocalImage(Uri uri)
{
ImageSource imageSource = null;
BitmapSource image = null;
var path = uri.IsAbsoluteUri ? uri.LocalPath : uri.OriginalString;
if (File.Exists(path))
{
using (var stream = File.OpenRead(path))
{
imageSource = LoadImage(stream);
image = LoadImage(stream);
}
}
return imageSource;
return image;
}
private static Task<ImageSource> LoadLocalImageAsync(Uri uri)
private static Task<BitmapSource> LoadLocalImageAsync(Uri uri)
{
return Task.Run(() => LoadLocalImage(uri));
}