diff --git a/MapControl/Shared/ImageLoader.cs b/MapControl/Shared/ImageLoader.cs index edad2921..40e5dd6c 100644 --- a/MapControl/Shared/ImageLoader.cs +++ b/MapControl/Shared/ImageLoader.cs @@ -63,7 +63,7 @@ namespace MapControl } else if (IsTileAvailable(response.Headers)) { - imageSource = await CreateImageSourceAsync(response.Content); + imageSource = await LoadImageAsync(response.Content); } } diff --git a/MapControl/UWP/ImageLoader.UWP.cs b/MapControl/UWP/ImageLoader.UWP.cs index 3b2ab760..f39651ef 100644 --- a/MapControl/UWP/ImageLoader.UWP.cs +++ b/MapControl/UWP/ImageLoader.UWP.cs @@ -18,30 +18,30 @@ namespace MapControl { public static partial class ImageLoader { - public static async Task CreateImageSourceAsync(IRandomAccessStream stream) + public static async Task LoadImageAsync(IRandomAccessStream stream) { var bitmapImage = new BitmapImage(); await bitmapImage.SetSourceAsync(stream); return bitmapImage; } - public static async Task CreateImageSourceAsync(byte[] buffer) + public static async Task LoadImageAsync(byte[] buffer) { using (var stream = new InMemoryRandomAccessStream()) { await stream.WriteAsync(buffer.AsBuffer()); stream.Seek(0); - return await CreateImageSourceAsync(stream); + return await LoadImageAsync(stream); } } - private static async Task CreateImageSourceAsync(IHttpContent content) + private static async Task LoadImageAsync(IHttpContent content) { using (var stream = new InMemoryRandomAccessStream()) { await content.WriteToStreamAsync(stream); stream.Seek(0); - return await CreateImageSourceAsync(stream); + return await LoadImageAsync(stream); } } @@ -56,7 +56,7 @@ namespace MapControl using (var stream = await file.OpenReadAsync()) { - imageSource = await CreateImageSourceAsync(stream); + imageSource = await LoadImageAsync(stream); } } diff --git a/MapControl/UWP/TileImageLoader.UWP.cs b/MapControl/UWP/TileImageLoader.UWP.cs index 7d2048be..bbed6327 100644 --- a/MapControl/UWP/TileImageLoader.UWP.cs +++ b/MapControl/UWP/TileImageLoader.UWP.cs @@ -72,7 +72,7 @@ namespace MapControl { try { - tile.SetImage(await ImageLoader.CreateImageSourceAsync(stream)); + tile.SetImage(await ImageLoader.LoadImageAsync(stream)); tcs.SetResult(null); } catch (Exception ex) diff --git a/MapControl/WPF/ImageLoader.WPF.cs b/MapControl/WPF/ImageLoader.WPF.cs index 547e027e..42d3a3d5 100644 --- a/MapControl/WPF/ImageLoader.WPF.cs +++ b/MapControl/WPF/ImageLoader.WPF.cs @@ -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 CreateImageSourceAsync(Stream stream) + public static Task 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 CreateImageSourceAsync(byte[] buffer) + public static Task LoadImageAsync(byte[] buffer) { - return Task.Run(() => CreateImageSource(buffer)); + return Task.Run(() => LoadImage(buffer)); } - private static async Task CreateImageSourceAsync(HttpContent content) + private static async Task 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); } } diff --git a/MapControl/WPF/TileImageLoader.WPF.cs b/MapControl/WPF/TileImageLoader.WPF.cs index 7e78af72..bb128266 100644 --- a/MapControl/WPF/TileImageLoader.WPF.cs +++ b/MapControl/WPF/TileImageLoader.WPF.cs @@ -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)); }