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

Revert to using MemoryStream in WinUI ImageLoader

Browse source
This commit is contained in:
ClemensFischer 2023-08-20 14:00:30 +02:00
parent 359e253d00
commit 7b404446d2
3 changed files with 17 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
MapControl/Shared/ImageLoader.cs
View file

@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Net.Http;
using System.Threading.Tasks;
@ -65,6 +66,14 @@ namespace MapControl
return image;
}
public static async Task<ImageSource> LoadImageAsync(byte[] buffer)
{
using (var stream = new MemoryStream(buffer))
{
return await LoadImageAsync(stream);
}
}
internal class HttpResponse
{
public byte[] Buffer { get; }

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

@ -31,14 +31,6 @@ namespace MapControl
return Task.FromResult(LoadImage(stream));
}
public static async Task<ImageSource> LoadImageAsync(byte[] buffer)
{
using (var stream = new MemoryStream(buffer))
{
return await LoadImageAsync(stream);
}
}
public static Task<ImageSource> LoadImageAsync(string path)
{
return Task.Run(() =>

29
MapControl/WinUI/ImageLoader.WinUI.cs
View file

@ -21,32 +21,35 @@ namespace MapControl
{
public static partial class ImageLoader
{
public static async Task<ImageSource> LoadImageAsync(BitmapDecoder decoder)
#if false
public static async Task<SoftwareBitmapSource> LoadImageAsync(BitmapDecoder decoder)
{
#if USE_SOFTWAREBITMAP
var image = new SoftwareBitmapSource();
var bitmap = await decoder.GetSoftwareBitmapAsync(
BitmapPixelFormat.Bgra8, BitmapAlphaMode.Premultiplied, new BitmapTransform(),
ExifOrientationMode.IgnoreExifOrientation, ColorManagementMode.DoNotColorManage);
await image.SetBitmapAsync(bitmap);
return image;
}
#else
public static async Task<WriteableBitmap> LoadImageAsync(BitmapDecoder decoder)
{
var image = new WriteableBitmap((int)decoder.PixelWidth, (int)decoder.PixelHeight);
var pixelData = await decoder.GetPixelDataAsync(
BitmapPixelFormat.Bgra8, BitmapAlphaMode.Premultiplied, new BitmapTransform(),
ExifOrientationMode.IgnoreExifOrientation, ColorManagementMode.DoNotColorManage);
pixelData.DetachPixelData().CopyTo(image.PixelBuffer);
#endif
return image;
}
#endif
public static async Task<ImageSource> LoadImageAsync(IRandomAccessStream stream)
{
// WinUI BitmapImage produces visual artifacts with Bing Maps Aerial (or all JPEG?)
// images in a tile raster, where thin white lines may appear as gaps between tiles.
// Alternatives are SoftwareBitmapSource or WriteableBitmap.
#if USE_BITMAPIMAGE
#if false
var image = new BitmapImage();
await image.SetSourceAsync(stream);
return image;
@ -60,22 +63,6 @@ namespace MapControl
return LoadImageAsync(stream.AsRandomAccessStream());
}
public static async Task<ImageSource> LoadImageAsync(IBuffer buffer)
{
using (var stream = new InMemoryRandomAccessStream())
{
await stream.WriteAsync(buffer);
stream.Seek(0);
return await LoadImageAsync(stream);
}
}
public static Task<ImageSource> LoadImageAsync(byte[] buffer)
{
return LoadImageAsync(buffer.AsBuffer());
}
public static async Task<ImageSource> LoadImageAsync(string path)
{
ImageSource image = null;