diff options
| author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2022-03-03 17:39:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-03 17:39:55 +0300 |
| commit | 45d2cb2c968afceabdb1cb8bf9200a5603fbda6c (patch) | |
| tree | bb47d4f6817d6d90a04d9bc6f81b013a50c2997e | |
| parent | 2a04d67bf3ea47c6f5b0a98615060d7e6ce5d9f2 (diff) | |
| parent | 5f5e605c438f840933f57fbc7597c84031a6c043 (diff) | |
Merge pull request #1065 from mono/dev/therzok/lazy-image
Optimize some image API usages
| -rw-r--r-- | Xwt.XamMac/Xwt.Mac/ImageHandler.cs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Xwt.XamMac/Xwt.Mac/ImageHandler.cs b/Xwt.XamMac/Xwt.Mac/ImageHandler.cs index a11f86d3..8ba931ac 100644 --- a/Xwt.XamMac/Xwt.Mac/ImageHandler.cs +++ b/Xwt.XamMac/Xwt.Mac/ImageHandler.cs @@ -51,9 +51,7 @@ namespace Xwt.Mac public override object LoadFromStream (Stream stream) { - using (NSData data = NSData.FromStream (stream)) { - return new NSImage (data); - } + return NSImage.FromStream (stream); } public override object LoadFromFile (string file) @@ -71,8 +69,9 @@ namespace Xwt.Mac public override object CreateMultiSizeIcon (IEnumerable<object> images) { - if (images.Count () == 1) - return images.First (); + var singleImage = images.SingleOrDefault (); + if (singleImage != null) + return singleImage; NSImage res = new NSImage (); foreach (NSImage img in images) @@ -251,10 +250,8 @@ namespace Xwt.Mac static NSImage FromResource (string res) { - var stream = typeof(ImageHandler).Assembly.GetManifestResourceStream (res); - using (stream) - using (NSData data = NSData.FromStream (stream)) { - return new NSImage (data); + using (var stream = typeof(ImageHandler).Assembly.GetManifestResourceStream (res)) { + return NSImage.FromStream (stream); } } |