Merge pull request #22 from paulcbetts/winrt-resload-to-writeablebitmap

Bitmap LoadFromResource depend on Load method on WinRT
reactiveui · Oct 12, 2013 · 5819802 · 5819802
2 parents c57020d + 0f5bd69
commit 5819802
Showing 1 changed file with 5 additions and 14 deletions.
diff --git a/Splat/WinRT/Bitmaps.cs b/Splat/WinRT/Bitmaps.cs
@@ -56,21 +56,12 @@ public async Task<IBitmap> Load(Stream sourceStream, float? desiredWidth, float?
             }
         }
 
-        public Task<IBitmap> LoadFromResource(string resource, float? desiredWidth, float? desiredHeight)
+        public async Task<IBitmap> LoadFromResource(string resource, float? desiredWidth, float? desiredHeight)
         {
-            // NB: I'm sure there's a way to return a constant as a Task but
-            // I'm too lazy to look it up.
-            return Task.Run(() => {
-                var source = new BitmapImage();
-
-                if (desiredWidth != null) {
-                    source.DecodePixelWidth = (int)desiredWidth;
-                    source.DecodePixelHeight = (int)desiredHeight;
-                }
-
-                source.UriSource = new Uri(resource);
-                return (IBitmap)new BitmapImageBitmap(source);
-            });
+            var file = await StorageFile.GetFileFromApplicationUriAsync(new Uri(resource));
+            using (var stream = await file.OpenAsync(FileAccessMode.Read)) {
+                return await Load(stream.AsStreamForRead(), desiredWidth, desiredHeight);
+            }
         }
 
         public IBitmap Create(float width, float height)