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

Remove Task.Run in ImageLoader.LoadImageAsync

Browse source
This commit is contained in:
ClemensFischer 2025-02-23 18:38:34 +01:00
parent edcdeb09c1
commit f03a627a86
3 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,12 +32,10 @@ namespace MapControl
return Task.FromResult<IImage>(null); return Task.FromResult<IImage>(null);
} }
return Task.Run(() => using (var stream = File.OpenRead(path))
{ {
using var stream = File.OpenRead(path); return LoadImageAsync(stream);
}
return LoadImage(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)

9
MapControl/Shared/GeoImage.cs
View file

@ -132,12 +132,11 @@ namespace MapControl
var file = Path.GetFileNameWithoutExtension(sourcePath); var file = Path.GetFileNameWithoutExtension(sourcePath);
var worldFilePath = Path.Combine(dir, file + ext.Remove(2, 1) + "w"); var worldFilePath = Path.Combine(dir, file + ext.Remove(2, 1) + "w");
if (File.Exists(worldFilePath)) if (await ImageLoader.LoadImageAsync(sourcePath) is BitmapSource bitmap)
{ {
return new GeoBitmap( var transform = await ReadWorldFileMatrix(worldFilePath);
(BitmapSource)await ImageLoader.LoadImageAsync(sourcePath),
await ReadWorldFileMatrix(worldFilePath), return new GeoBitmap(bitmap, transform, null);
null);
} }
} }

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

@ -43,13 +43,10 @@ namespace MapControl
return Task.FromResult<ImageSource>(null); return Task.FromResult<ImageSource>(null);
} }
return Task.Run(() =>
{
using (var stream = File.OpenRead(path)) using (var stream = File.OpenRead(path))
{ {
return LoadImage(stream); 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)